diff options
Diffstat (limited to 'conf/machine')
77 files changed, 114 insertions, 84 deletions
diff --git a/conf/machine/canyonlands.conf b/conf/machine/canyonlands.conf index 177738b1ff..0a9446f678 100644 --- a/conf/machine/canyonlands.conf +++ b/conf/machine/canyonlands.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc440e" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.26" diff --git a/conf/machine/d201gly2.conf b/conf/machine/d201gly2.conf index 75a6920246..fb65dce765 100644 --- a/conf/machine/d201gly2.conf +++ b/conf/machine/d201gly2.conf @@ -6,9 +6,8 @@ TARGET_ARCH = "i686" -PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686 i686p4c" -PREFERRED_PROVIDER_virtual/kernel = "linux +PREFERRED_PROVIDER_virtual/kernel = "linux" KERNEL_IMAGETYPE = "bzImage" OLDEST_KERNEL = "2.6.17" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index 25fb5b11a9..a033de1714 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -5,7 +5,6 @@ #@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP development platform TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc405" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" UBOOT_ENTRYPOINT = "0" diff --git a/conf/machine/dns323.conf b/conf/machine/dns323.conf new file mode 100644 index 0000000000..c5ea3c38bd --- /dev/null +++ b/conf/machine/dns323.conf @@ -0,0 +1,5 @@ +#@NAME: ARM/Orion based D-Link DNS-323 + +MACHINE_EXTRA_RDEPENDS = "u-boot-utils" + +require conf/machine/include/orion.inc diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 5bf42da797..dd4ba06f90 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the EFIKA development platform: http://www.pegasosppc.com/efika.php TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc603e" PREFERRED_PROVIDER_virtual/kernel ?= "linux-rt" diff --git a/conf/machine/gumstix-custom-connex.conf b/conf/machine/gumstix-custom-connex.conf index 65cbacad41..b59b056d3b 100644 --- a/conf/machine/gumstix-custom-connex.conf +++ b/conf/machine/gumstix-custom-connex.conf @@ -4,7 +4,6 @@ MACHINE_FEATURES += "connex" require conf/machine/include/gumstix.inc -require conf/machine/include/tune-xscale.inc # # Your flash size = Total flash (in MB) - 1 (for linux kernel partition) diff --git a/conf/machine/gumstix-custom-verdex.conf b/conf/machine/gumstix-custom-verdex.conf index 5e9360d9b0..97e4defa2c 100644 --- a/conf/machine/gumstix-custom-verdex.conf +++ b/conf/machine/gumstix-custom-verdex.conf @@ -5,7 +5,6 @@ MACHINE_FEATURES += "verdex" MACHINE_FEATURES += "iwmmxt" require conf/machine/include/gumstix.inc -require conf/machine/include/tune-xscale.inc # # Your flash size = Total flash (in MB) - 1 (for linux kernel partition) diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index c037226154..7bbb22354f 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 " require conf/machine/include/tune-strongarm.inc diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf index 2ae1419bae..30dbaeb5a8 100644 --- a/conf/machine/htcsable.conf +++ b/conf/machine/htcsable.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf index b311afe1b4..1c472f5a24 100644 --- a/conf/machine/htctornado.conf +++ b/conf/machine/htctornado.conf @@ -5,7 +5,6 @@ #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2" diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index 34255a1536..4c5f1d6e57 100644 --- a/conf/machine/htcwallaby.conf +++ b/conf/machine/htcwallaby.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 " require conf/machine/include/tune-strongarm.inc diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index 84733217d1..c9957e2b2f 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " +PACKAGE_EXTRA_ARCHS += "iwmmxt" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index 7918131cd3..02079d3a6b 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -6,8 +6,6 @@ TARGET_ARCH = "i586" -PACKAGE_EXTRA_ARCHS = "x86" - PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index b4d254ca50..56353777c3 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "i686" -PACKAGE_EXTRA_ARCHS = "x86" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" diff --git a/conf/machine/include/lsppc.inc b/conf/machine/include/lsppc.inc index 632a9ed4cc..807c292605 100644 --- a/conf/machine/include/lsppc.inc +++ b/conf/machine/include/lsppc.inc @@ -2,11 +2,12 @@ #@Name: Buffalo PPC Linkstations #@DESCRIPTION: Generic Machine configuration for ppc based linkstations - TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" -TARGET_FPU = "hard" + +MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_EXTRA_RDEPENDS = "kernel-devicetree avr-evtd" +MACHINE_EXTRA_RRECOMMENDS = "u-boot-utils" USE_DEVFS = "0" @@ -22,5 +23,8 @@ udevdir = "/dev" IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" IMAGE_FSTYPES = "tar.gz" -#tune for the MPC5200B cpu +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "0x00000000" +UBOOT_LOADADDRESS = "0x00000000" + require conf/machine/include/tune-ppc603e.inc diff --git a/conf/machine/include/orion.inc b/conf/machine/include/orion.inc index 4f2d9a38e5..c6fe6e3678 100644 --- a/conf/machine/include/orion.inc +++ b/conf/machine/include/orion.inc @@ -2,9 +2,8 @@ #@DESCRIPTION: Machine configuration for various different Marvell Orion based devices TARGET_ARCH = "arm" -TARGET_FPU = "soft" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci" +MACHINE_FEATURES = "kernel26 usbhost ext2 vfat" MACHINE_TASK_PROVIDER = "task-base" USE_DEVFS = "0" @@ -17,4 +16,9 @@ IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" IMAGE_FSTYPES = "tar.gz" SERIAL_CONSOLE = "ttyS0 115200" +# Currently all the orion devices we support use uImage +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "0x00008000" +UBOOT_LOADADDRESS = "0x00008000" + require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/include/tune-arm1176jzf-s.inc b/conf/machine/include/tune-arm1176jzf-s.inc new file mode 100644 index 0000000000..b7c5291731 --- /dev/null +++ b/conf/machine/include/tune-arm1176jzf-s.inc @@ -0,0 +1,7 @@ +TARGET_CC_ARCH = "-march=armv6j -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp" +FEED_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" +PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6" + +# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish +require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/tune-i486sx.inc b/conf/machine/include/tune-i486sx.inc new file mode 100644 index 0000000000..bd8025924a --- /dev/null +++ b/conf/machine/include/tune-i486sx.inc @@ -0,0 +1,9 @@ +TARGET_ARCH = "i486" +TARGET_CC_ARCH = "-march=i486" +PACKAGE_EXTRA_ARCHS = "486sx" +BASE_PACKAGE_ARCH = "486sx" +FEED_ARCH = "${BASE_PACKAGE_ARCH}" + +# gcc doesn't understand softfloat: +# "This target does not support --with-float" + diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc index 4e5be154dd..0df6917699 100644 --- a/conf/machine/include/tune-pentium.inc +++ b/conf/machine/include/tune-pentium.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentium" BASE_PACKAGE_ARCH = "i586" FEED_ARCH = "i586" -PACKAGE_EXTRA_ARCHS += "i386 i486" +PACKAGE_EXTRA_ARCHS += "x86 i386 i486" diff --git a/conf/machine/include/tune-pentium4c.inc b/conf/machine/include/tune-pentium4c.inc index 302eb3c4a0..42de0d9abd 100644 --- a/conf/machine/include/tune-pentium4c.inc +++ b/conf/machine/include/tune-pentium4c.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=prescott" BASE_PACKAGE_ARCH = "i686p4c" - +PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586" diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc index 63dda25f58..9b9a8be42f 100644 --- a/conf/machine/include/tune-pentiumpro.inc +++ b/conf/machine/include/tune-pentiumpro.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentiumpro" BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" -PACKAGE_EXTRA_ARCHS += "i386 i486 i586" +PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586" diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc index a54aec0336..e5edd68040 100644 --- a/conf/machine/include/tune-ppc405.inc +++ b/conf/machine/include/tune-ppc405.inc @@ -3,3 +3,4 @@ TARGET_FPU ?= "soft" TARGET_CC_ARCH = "-mcpu=405" BASE_PACKAGE_ARCH = "ppc405" FEED_ARCH = "ppc405" +PACKAGE_EXTRA_ARCHS += "ppc405" diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc index 7d7ca0ea11..feca186315 100644 --- a/conf/machine/include/tune-ppc440.inc +++ b/conf/machine/include/tune-ppc440.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-mcpu=440" BASE_PACKAGE_ARCH = "ppc440" FEED_ARCH = "ppc440" +PACKAGE_EXTRA_ARCHS += "ppc440e" diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc index cbcef8a573..8b6955a817 100644 --- a/conf/machine/include/tune-ppc440e.inc +++ b/conf/machine/include/tune-ppc440e.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-mcpu=440fp -mhard-float" BASE_PACKAGE_ARCH = "ppc440e" FEED_ARCH = "ppc440e" +PACKAGE_EXTRA_ARCHS += "ppc440e" diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc index f48dc26e05..2f627a725d 100644 --- a/conf/machine/include/tune-ppc603e.inc +++ b/conf/machine/include/tune-ppc603e.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-mcpu=603e -mhard-float" BASE_PACKAGE_ARCH = "ppc603e" FEED_ARCH = "ppc603e" +PACKAGE_EXTRA_ARCHS += "ppc603e" diff --git a/conf/machine/include/tune-ppce300c2.inc b/conf/machine/include/tune-ppce300c2.inc index 41ddd4151a..1524c7cf86 100644 --- a/conf/machine/include/tune-ppce300c2.inc +++ b/conf/machine/include/tune-ppce300c2.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-mcpu=e300c2" BASE_PACKAGE_ARCH = "ppce300c2" FEED_ARCH = "ppce300c2" +PACKAGE_EXTRA_ARCHS += "ppce300c2" diff --git a/conf/machine/include/tune-ppce300c3.inc b/conf/machine/include/tune-ppce300c3.inc index 24af11a8ba..467c4cc87f 100644 --- a/conf/machine/include/tune-ppce300c3.inc +++ b/conf/machine/include/tune-ppce300c3.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-mcpu=e300c3" BASE_PACKAGE_ARCH = "ppce300c3" FEED_ARCH = "ppce300c3" +PACKAGE_EXTRA_ARCHS += "ppce300c3" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index 37499a61dc..5745c36311 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -6,3 +6,4 @@ ARM_ABI = "oabi" TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" FEED_ARCH = "arm-oabi" +PACKAGE_EXTRA_ARCHS += "armv4 " diff --git a/conf/machine/include/tune-x86-nocona.inc b/conf/machine/include/tune-x86-nocona.inc index f1189a171e..9bee740dd4 100644 --- a/conf/machine/include/tune-x86-nocona.inc +++ b/conf/machine/include/tune-x86-nocona.inc @@ -1,2 +1,3 @@ TARGET_CC_ARCH = "-march=nocona" TARGET_CC_KERNEL_ARCH = "-march=nocona" +PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586" diff --git a/conf/machine/include/tune-x86-prescott.inc b/conf/machine/include/tune-x86-prescott.inc index f3ec4e956a..0a584f085a 100644 --- a/conf/machine/include/tune-x86-prescott.inc +++ b/conf/machine/include/tune-x86-prescott.inc @@ -1,2 +1,3 @@ TARGET_CC_ARCH = "-march=prescott" TARGET_CC_KERNEL_ARCH = "-march=prescott" +PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586" diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf index 5b88f457fa..a25290e589 100644 --- a/conf/machine/kb9202.conf +++ b/conf/machine/kb9202.conf @@ -5,7 +5,6 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t" require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/kilauea.conf b/conf/machine/kilauea.conf index 0ec14a9c5d..883448c062 100644 --- a/conf/machine/kilauea.conf +++ b/conf/machine/kilauea.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the AMCC Kilauea (405EX) TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc405" PREFERRED_PROVIDER_virtual/kernel = "linux" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index b67d3dc500..16a723cd1c 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -1,5 +1,4 @@ TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc" UBOOT_MACHINE = "Lite5200" SERIAL_CONSOLE="38400 ttyS0" diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index a046c5d00c..01bd1e2eca 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -7,7 +7,6 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.19.2" GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf index 1792cda280..88a1be34dc 100644 --- a/conf/machine/looxc550.conf +++ b/conf/machine/looxc550.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/lsmipsel.conf b/conf/machine/lsmipsel.conf index 4c9efd25a4..2ceb0ca925 100644 --- a/conf/machine/lsmipsel.conf +++ b/conf/machine/lsmipsel.conf @@ -2,14 +2,12 @@ #@NAME: Linkstation HD-HLAN #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD-HLAN (mipsel) -INHERIT += "lsmipsel-image" - TARGET_ARCH = "mipsel" -TARGET_FPU = "soft" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci" +MACHINE_FEATURES = "kernel26 usbhost ext2" MACHINE_TASK_PROVIDER = "task-base" -MACHINE_EXTRA_RDEPENDS = "avr-evtd u-boot-utils" +MACHINE_EXTRA_RDEPENDS = "avr-evtd" +MACHINE_EXTRA_RRECOMMENDS = "u-boot-utils" USE_DEVFS = "0" diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index 5d2ff2de41..171253bb96 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -1,7 +1,7 @@ #@TYPE: Machine #@NAME: HD Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD + UBOOT_MACHINE = "linkstation_HDLAN_config" -require conf/machine/include/lsppc.inc -INHERIT += "lsppchd-image" +require conf/machine/include/lsppc.inc diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index 92e4ae4029..0a0d2fc1e1 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -1,7 +1,7 @@ #@TYPE: Machine #@NAME: HG Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG + UBOOT_MACHINE = "linkstation_HGLAN_config" -require conf/machine/include/lsppc.inc -INHERIT += "lsppchg-image" +require conf/machine/include/lsppc.inc diff --git a/conf/machine/lspro.conf b/conf/machine/lspro.conf index e61943acb4..0c269760fd 100644 --- a/conf/machine/lspro.conf +++ b/conf/machine/lspro.conf @@ -1,6 +1,5 @@ #@NAME: ARM based Revolution Kurobox Pro -INHERIT += "lspro-image" MACHINE_EXTRA_RDEPENDS = "micro-evtd u-boot-utils" require conf/machine/include/orion.inc diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf index 9839b6d69e..bd29837fbb 100644 --- a/conf/machine/magicbox.conf +++ b/conf/machine/magicbox.conf @@ -7,7 +7,6 @@ INHERIT += "magicbox-image" TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc405" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" diff --git a/conf/machine/mp900c.conf b/conf/machine/mp900c.conf index 37055be2bb..38b70a22c0 100644 --- a/conf/machine/mp900c.conf +++ b/conf/machine/mp900c.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the PXA255 based Mobile Pro 9xx palmtop computer TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index 83167b10ce..ed2579c8c0 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the Freescale MPC8313E-RDB TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppce300c3" PREFERRED_PROVIDER_virtual/kernel ?= "linux" diff --git a/conf/machine/mpc8315e-rdb.conf b/conf/machine/mpc8315e-rdb.conf index e0a1215bcf..7d3a93b815 100644 --- a/conf/machine/mpc8315e-rdb.conf +++ b/conf/machine/mpc8315e-rdb.conf @@ -6,7 +6,6 @@ # PCI Express x1, 2x SATA. TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppce300c3" PREFERRED_PROVIDER_virtual/kernel ?= "linux" diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index 78c9b8a462..e01aeaadb3 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppce300c2" PREFERRED_PROVIDER_virtual/kernel ?= "linux" diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf index ac7a6c19f3..d6d14d86df 100644 --- a/conf/machine/mtx-3.conf +++ b/conf/machine/mtx-3.conf @@ -8,7 +8,6 @@ # TARGET_ARCH should be set here in the machine configuration. # For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/mv2120.conf b/conf/machine/mv2120.conf new file mode 100644 index 0000000000..9fd90bfbe2 --- /dev/null +++ b/conf/machine/mv2120.conf @@ -0,0 +1,5 @@ +#@NAME: ARM/Orion based HP mv2120 + +MACHINE_EXTRA_RDEPENDS = "u-boot-utils" + +require conf/machine/include/orion.inc diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf index 0a092563fe..3abfa493dc 100644 --- a/conf/machine/mx21ads.conf +++ b/conf/machine/mx21ads.conf @@ -7,7 +7,6 @@ TARGET_ARCH = "arm" MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget" GUI_MACHINE_CLASS = "smallscreen" -PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" diff --git a/conf/machine/n1200.conf b/conf/machine/n1200.conf new file mode 100644 index 0000000000..b13576e2ed --- /dev/null +++ b/conf/machine/n1200.conf @@ -0,0 +1,28 @@ +#@TYPE: Machine +#@NAME: Thecus n1200 +#@DESCRIPTION: Machine configuration for the Thecus n1200, an MPC8347 based NAS + +TARGET_ARCH = "powerpc" +PACKAGE_EXTRA_ARCHS = "ppc ppc603e" + +MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_EXTRA_RRECOMMENDS = "temper u-boot-utils" + +USE_DEVFS = "0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-n1200" +PREFERRED_VERSION_linux-n1200 = "2.6.27-rc9+git" + +#don't try to access tty1 +USE_VT = "0" + +IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" +IMAGE_FSTYPES = "tar.gz" +SERIAL_CONSOLE = "ttyS0 115200" + +KERNEL_IMAGETYPE = "zImage" +UBOOT_LOADADDRESS = "00400000" +UBOOT_ENTRYPOINT = "004005a4" + +require conf/machine/include/tune-ppc603e.inc diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 026339ded6..a86a8db424 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -1,14 +1,17 @@ +#@TYPE: Machine +#@NAME: Thecus N2100 +#@DESCRIPTION: Machine configuration for a Thecus N2100, an Intel IOP based NAS + TARGET_ARCH = "arm" TARGET_OS = "linux" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" - INHERIT += "n2100-image" SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot" +MACHINE_FEATURES = "kernel26 usbhost ext2 redboot" +MACHINE_EXTRA_RDEPENDS = "temper" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" @@ -18,6 +21,7 @@ udevdir = "/dev" ERASEBLOCK_SIZE = "0x20000" IMAGE_FSTYPES = "jffs2" EXTRA_IMAGECMD = "--little-endian" + # Creating an image that works with the webinterface required encrypting it # So we'll need openssl EXTRA_IMAGEDEPENDS = "openssl-native" diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf index b265503ff5..c9a7f6c1c6 100644 --- a/conf/machine/navman-icn330.conf +++ b/conf/machine/navman-icn330.conf @@ -8,7 +8,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" #Compile with armv5te optimizations, incompatible with armv4(t) cpus require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index 330a1287e4..a74746824d 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -5,7 +5,6 @@ INHERIT += "linux-kernel-base" TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 65ad872ba6..2653b05cb6 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for a Linux IBM 8365 / J320 PC-based internet terminals TARGET_ARCH = "i486" -PACKAGE_EXTRA_ARCHS = "netvista" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.23" diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index ffec67b699..938435e0f6 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index ffec67b699..938435e0f6 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 98e3a7d3e5..951cb16a64 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the OMAP H3 development board with a 1710 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 343b0091b5..948325942a 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the OMAP H4 development board with a 2420 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" PREFERRED_VERSION_u-boot = "1.1.4" diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf index 0e6b646897..7b1f8abfda 100644 --- a/conf/machine/omap2430sdp.conf +++ b/conf/machine/omap2430sdp.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the OMAP 2430 SDP development board with a arm1136 processor. TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" PREFERRED_VERSION_u-boot = "1.1.4" diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf index ab78e881b8..4326af9d63 100644 --- a/conf/machine/palmtt.conf +++ b/conf/machine/palmtt.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for Palm Tungsten T/T2 TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te" MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "320" diff --git a/conf/machine/palmz71.conf b/conf/machine/palmz71.conf index 7837c5d564..0a7f27402b 100644 --- a/conf/machine/palmz71.conf +++ b/conf/machine/palmz71.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for Palm Zire 71 TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1" diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf index f8ca7ec033..0ec1b32a2d 100644 --- a/conf/machine/rx1950.conf +++ b/conf/machine/rx1950.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index 2531f984f0..83c88204a1 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/sarge-at91.conf b/conf/machine/sarge-at91.conf index 60026a39b5..fb8882f0d9 100644 --- a/conf/machine/sarge-at91.conf +++ b/conf/machine/sarge-at91.conf @@ -5,7 +5,6 @@ #Homepage: http://blackmesaeast.com.pl/projects/electronics/sarge-single-board-computer/ TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf index cc87511e1e..309c813bef 100644 --- a/conf/machine/sequoia.conf +++ b/conf/machine/sequoia.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc440e" PREFERRED_PROVIDER_virtual/kernel = "linux" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf index b11ca6e972..5f17bbab1d 100644 --- a/conf/machine/smdk2440.conf +++ b/conf/machine/smdk2440.conf @@ -4,7 +4,6 @@ TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2440" diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf index d3fccf1352..81c9a50345 100644 --- a/conf/machine/smdk2443.conf +++ b/conf/machine/smdk2443.conf @@ -4,7 +4,6 @@ TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index bc4bc52bb8..f7fabdc8bc 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,7 +1,6 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" -TARGET_FPU = "hard" -PACKAGE_EXTRA_ARCHS = "ppc ppc603e" +PACKAGE_EXTRA_ARCHS = "ppc" INHERIT += "storcenter-image" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index 0275f6b2f5..56ef0bf793 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the XScale based triton boards from KaRo Electronics TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "triton-kernel" BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel" diff --git a/conf/machine/ts101.conf b/conf/machine/ts101.conf index ac0e2877be..720e322408 100644 --- a/conf/machine/ts101.conf +++ b/conf/machine/ts101.conf @@ -3,5 +3,3 @@ #@DESCRIPTION: Generic Machine configuration for QNAP TS-101 require conf/machine/include/tsppc.inc - -INHERIT += "tsppc-image" diff --git a/conf/machine/ts201.conf b/conf/machine/ts201.conf index 1f40c048dd..720e322408 100644 --- a/conf/machine/ts201.conf +++ b/conf/machine/ts201.conf @@ -3,6 +3,3 @@ #@DESCRIPTION: Generic Machine configuration for QNAP TS-101 require conf/machine/include/tsppc.inc - -INHERIT += "tsppc-image" - diff --git a/conf/machine/ts409.conf b/conf/machine/ts409.conf index 24005a5f43..49402632a7 100644 --- a/conf/machine/ts409.conf +++ b/conf/machine/ts409.conf @@ -1,7 +1,3 @@ #@NAME: ARM based QNAP TS-409 -INHERIT += "ts409-image" -# Add config for ts409 for u-boot-utils fw_* utils before adding to deps -MACHINE_EXTRA_RDEPENDS = "" - require conf/machine/include/orion.inc diff --git a/conf/machine/tsx09.conf b/conf/machine/tsx09.conf index ef5d966f53..ac90362641 100644 --- a/conf/machine/tsx09.conf +++ b/conf/machine/tsx09.conf @@ -1,6 +1,5 @@ #@NAME: ARM based QNAP TS-109 and TS-209 MACHINE_EXTRA_RDEPENDS = "u-boot-utils piccontrol" -# piccontrol was broken on uclibc require conf/machine/include/orion.inc diff --git a/conf/machine/vmware.conf b/conf/machine/vmware.conf index d318bb7c35..3c0d8fea13 100644 --- a/conf/machine/vmware.conf +++ b/conf/machine/vmware.conf @@ -6,7 +6,6 @@ #@DESCRIPTION: Machine configuration for a VMWare virtual PC TARGET_ARCH = "i686" -PACKAGE_EXTRA_ARCHS = "vmware" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" diff --git a/conf/machine/vortex86sx.conf b/conf/machine/vortex86sx.conf new file mode 100644 index 0000000000..4595b6aebe --- /dev/null +++ b/conf/machine/vortex86sx.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: Vortex86sx i486sx clone + +require conf/machine/include/tune-i486sx.inc + +MACHINE_FEATURES += "x86" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d" + +KERNEL_IMAGETYPE = "bzImage" + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf index 91cf003420..d50d24ecb0 100644 --- a/conf/machine/x86-32-nocona.conf +++ b/conf/machine/x86-32-nocona.conf @@ -5,7 +5,6 @@ TARGET_ARCH = "i686" MACHINE_ARCH = "x86-32-nocona" -PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686" require conf/machine/include/tune-x86-nocona.inc diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf index 5ea5079072..51606a6d52 100644 --- a/conf/machine/x86-prescott.conf +++ b/conf/machine/x86-prescott.conf @@ -4,7 +4,6 @@ TARGET_ARCH = "i686" MACHINE_ARCH = "x86-prescott" -PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686" require conf/machine/include/tune-x86-prescott.inc diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf index 219d1f301e..eb2ddcff69 100644 --- a/conf/machine/xilinx-ml403.conf +++ b/conf/machine/xilinx-ml403.conf @@ -5,7 +5,6 @@ #@DESCRIPTION: Machine configuration for Xilinx ML403 (softcore ppc) development platform http://www.xilinx.com/ml403 TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc405" PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-slab" diff --git a/conf/machine/xilinx-ml410.conf b/conf/machine/xilinx-ml410.conf index ea61b7a7fd..19418a9550 100644 --- a/conf/machine/xilinx-ml410.conf +++ b/conf/machine/xilinx-ml410.conf @@ -3,10 +3,9 @@ #@TYPE: Machine #@Name: Xilinx ML410 FPGA Development Platform #@DESCRIPTION: Machine configuration for Xilinx ML410 Virtex-4 FX Embedded Development Platform \ -(softcore ppc) development platform http://www.xilinx.com/ml410 +#(softcore ppc) development platform http://www.xilinx.com/ml410 TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc405" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" |