diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-25 10:14:35 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-25 10:14:35 +0100 |
| commit | 77cfe0930b039016848f590ebf736442c03a9975 (patch) | |
| tree | 8820e6db1663c59d044241dcb3bdd3f7f32b8afd /conf | |
| parent | db87e0cfa625d0246461c530c0d9ada944e44969 (diff) | |
| parent | 97a4caf877fd9d1eb4f63acc21ae8df1003fc353 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 14 | ||||
| -rw-r--r-- | conf/machine/include/kirkwood.inc | 2 | ||||
| -rw-r--r-- | conf/machine/qemumips.conf | 14 |
3 files changed, 26 insertions, 4 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index a2d7bda6bd..bf1e7425b9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16958,6 +16958,14 @@ sha256=28bbab4a69a3c78539b2588d2219327009d93cafc74fb59b9a4ea5f5b794f8db md5=8dbadad76ee360c2ed2caa915f5b1c8e sha256=28bbab4a69a3c78539b2588d2219327009d93cafc74fb59b9a4ea5f5b794f8db +[ftp://ftp.us.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3-2.diff.gz] +md5=969baa0900646c0262b2d505b9fef154 +sha256=f647d7c2f2b0d1dbddd632f3a17fef670aed3ebf5fbe6c1633337acac1eba8e3 + +[ftp://ftp.us.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3.orig.tar.gz] +md5=3fa7fe715ab879db08bd06d1d59fd90f +sha256=5c6627d6d5a98a92ca4661cfc16378b182cc46a9ec479ebf7e6121ee3fe2be32 + [http://ltt.polymtl.ca/lttng/ltt-control-0.12-21062006.tar.gz] md5=053abb5ce58363ae09340e00de28c520 sha256=c53f07c095642303e22b283212bb0da45020b0714e24310ed0e396c560a78e1f @@ -21106,9 +21114,9 @@ sha256=6d52c706401af197bd9d7e0187c35b4a3463ea720392ffa0c020d94899b361e5 md5=f490bca772b16472962c7b9f23b1e97d sha256=b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc -[ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/proftpd-1.3.2.tar.gz] -md5=756f762883cc8eed03d99dc3b1c56a8e -sha256=5e00c20d74bbf98fb8bcc63bd4aecfd08480a87ec731dae8955bd9fca6a01bb3 +[ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/proftpd-1.3.2b.tar.gz] +md5=4918908fcae9e591ba84c66edff73410 +sha256=fffee421390fe2647eeb0515a8c20759fda75e3df2014fc0a47e8a314e5ea88b [http://downloads.sourceforge.net/progear/progear-ac-0.1.tar.gz] md5=60a89c2c907fb5ff2293ce3dfbcdace6 diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index 3fc0654c14..20f53bf643 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r10" +MACHINE_KERNEL_PR = "r11" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" diff --git a/conf/machine/qemumips.conf b/conf/machine/qemumips.conf new file mode 100644 index 0000000000..0b109d8937 --- /dev/null +++ b/conf/machine/qemumips.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: qemu MIPS (big-endian) Emulator setup +#@DESCRIPTION: Machine configuration for running an MIPS r4k platform system under qemu emulation + +TARGET_ARCH = "mips" + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-mips32.inc + +KERNEL_IMAGETYPE = "vmlinux.bin" + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux" |