conf/machine: EXTRA_PACKAGES_ARCHS cleanup

All duplicates in EXTRA_PACKAGE_ARCHS are removed.

Moved EXTRA_PACKAGES_ARCHS to include/tune-* files (PPC and x86
targets), dropped it for ARM targets (as tune-arm* files have them
defined properly).

diff --git a/conf/machine/canyonlands.conf b/conf/machine/canyonlands.conf
index 177738b1fff9cfb08212ee2a85c3bfb7ef138962..0a9446f67850181c4aab2204383ed161415a31c0 100644 (file)
--- 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 75a69202464bdd9859260770340d0c540e0ffdf9..fb65dce7658ebfb382fb43d67ed0868c949c2eb4 100644 (file)
--- 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 25fb5b11a9e9867161e3b645c4eca1b2f886e19e..a033de171424682574502cfd04814161f36c6219 100644 (file)
--- 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/efika.conf b/conf/machine/efika.conf
index 5bf42da797a2d8717a40f520925f831c63bb57bb..dd4ba06f909b4e0e92a72df9112723cb2871a6c9 100644 (file)
--- 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 65cbacad4150e25d7e18397f247e7a39eb7ff517..b59b056d3b7e407b6e69e55a95d64e0618d19a42 100644 (file)
--- 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 5e9360d9b0ed99dfe31a6d426691a4895ae4b77b..97e4defa2ce99f93a66f34f65ae21af4ffc42cb3 100644 (file)
--- 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 c037226154d8e5b89ea67230e0ce65991b57ed83..7bbb22354fdda3a741d03798158bf56f30cccbe8 100644 (file)
--- 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 2ae1419bae5a002f971edbe48bb14dce92b249c3..30dbaeb5a8b5af8e50d682313518bd4b5ddaba82 100644 (file)
--- 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 b311afe1b4e7f1e26ea5504cff819b91e9d00223..1c472f5a24195c7f7ad74ae18f4dc30341fe9997 100644 (file)
--- 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 34255a15369618fbd47b78807e8b6020d5220af7..4c5f1d6e579b2c2b42f01d702cbb6feeedb2a0cc 100644 (file)
--- 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 84733217d1141b303ea7ccf9ea3435f731ca6f44..c9957e2b2f94e5a9918e95b2091d34c71a17fac0 100644 (file)
--- 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 7918131cd3490a9da3526d0fa1723e205e8a0d7a..02079d3a6bd7dcd64c5bd5216dde8d4691d0a9a5 100644 (file)
--- 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 b4d254ca504f32a21a64b941c222a2a74f3f9c18..56353777c32c1c36f9f9c3a17b4e6cae6b42f25e 100644 (file)
--- 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/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
index 4e5be154ddc4cd98e538705640f3f1e769b07204..0df691769958fb6eb79ccfaba27354cae5a18e5a 100644 (file)
--- 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 302eb3c4a0cea2b5cdbd709065dad0b9ae1caea9..42de0d9abdd3fd3b493d44f5c71df1c09a5b477b 100644 (file)
--- 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 63dda25f581444af288aed0bd6da76aad17bca91..9b9a8be42f75486f91e14ad6a308ee2939377426 100644 (file)
--- 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 a54aec0336f7ac1293aa247dbcf2f98e7dc5c70c..e5edd6804096f16c0958d18b18c1e97c1e53f40e 100644 (file)
--- 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 7d7ca0ea1143a7538b9d3d6f1f7d7ceb1650fe20..feca1863158e7a288294938f62cbbd98c333e97c 100644 (file)
--- 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 cbcef8a5732688e2742ac2f1f73baf507a5b31f3..8b6955a817cc44180918be9cfacc3c7cdbb820f9 100644 (file)
--- 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 f48dc26e05ec95c9a12be7aa84626bbb45fdcece..2f627a725d6f67b25644d9b09c97dc0fc3f5dcd6 100644 (file)
--- 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 41ddd4151ab4a38bdd01e449e278f8f91d8246af..1524c7cf86016ed56626aed921169315b9f56792 100644 (file)
--- 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 24af11a8ba83063d4d8e4a63e360f34a14164f33..467c4cc87fc621703c3a78568c7f7d82473256ba 100644 (file)
--- 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 37499a61dc1a349cab023f65a2d8a662eeec81b5..5745c36311b38ea823e849c2a6794e81a789188f 100644 (file)
--- 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 f1189a171e521bc2232aa563333af641b3d09f9d..9bee740dd4bf831ba22df23fa283dcb1b1f48bf9 100644 (file)
--- 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 f3ec4e956aa05bf5d14747062c67f4a2dd0b5345..0a584f085a958c2f11ebed77d61e0e88c44f0c9d 100644 (file)
--- 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 5b88f457fa64510dd0b8d21e469c5be75108df57..a25290e58905cbd9e2165e23c1024453f325ceb4 100644 (file)
--- 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 0ec14a9c5d6833f6961dd4676460dade9b518b95..883448c0627c346415135fecbab3f6745a021e50 100644 (file)
--- 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 b67d3dc5008f08faab218d4975d7150d0bb61853..16a723cd1c2b60a2e9676f50d42e310c2f21240e 100644 (file)
--- 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 a046c5d00c759ab7df8fc8e53f17e0aea3c18edf..01bd1e2eca7dae28a55b51a8313e8af869ddc39e 100644 (file)
--- 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 1792cda28020a7c7e52cfa45c5d82bc1ee2d256d..88a1be34dc4f188bb50a61e2fde200b3486ad338 100644 (file)
--- 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/magicbox.conf b/conf/machine/magicbox.conf
index 9839b6d69efb7719604e164d45aea50118849ecb..bd29837fbb6901208a07730b4d80050982159e22 100644 (file)
--- 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 37055be2bb8ac9e787be40ba1409bdd451c36ca5..38b70a22c043958a408a045596404c8c1e4d3511 100644 (file)
--- 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 83167b10ceb4e687fa5d94a6fba047be23da8497..ed2579c8c048c712ff749b2e13bc71a8e6fc087e 100644 (file)
--- 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 e0a1215bcf969c3919210228706e804201712940..7d3a93b8153a725aa0b8017a3ab50c81e239aaa4 100644 (file)
--- 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 78c9b8a462d4d958bb6cad208bd821d7012e1840..e01aeaadb30c1d41fe0c10ebdf0213c298e44cfd 100644 (file)
--- 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 ac7a6c19f39d99b947f433780914128d56c406fd..d6d14d86dfbdc5fae76aca1805642f92137c53ba 100644 (file)
--- 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/mx21ads.conf b/conf/machine/mx21ads.conf
index 0a092563fe69b4c681da13cdd337440819b3f7c3..3abfa493dcccf4c4a13f86bff3df2b29a35a6c77 100644 (file)
--- 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/navman-icn330.conf b/conf/machine/navman-icn330.conf
index b265503ff563608fe80c12705cc6c70db9477e99..c9a7f6c1c60eb0523859420530e3cdecb5ad821d 100644 (file)
--- 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 330a1287e409f6c184128852af566aee53293efc..a74746824dc0f71f8451b763dfc0f511d8866271 100755 (executable)
--- 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 65ad872ba6b1fa2304144e18b128c6d7f35d34e4..2653b05cb683fe7289da7682203975c877fe1537 100644 (file)
--- 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 ffec67b699f914fdc67c10269af6db3d2a8ad152..938435e0f625a7694ecfae6567c3cb34c3bf9579 100644 (file)
--- 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 ffec67b699f914fdc67c10269af6db3d2a8ad152..938435e0f625a7694ecfae6567c3cb34c3bf9579 100644 (file)
--- 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 98e3a7d3e5b785b0f1adf1a4a544cd19caaef6ad..951cb16a64a38079c4c86c88fd31a825926406c4 100644 (file)
--- 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 343b0091b5136af6de1ae07bae5faff23b08810f..948325942aa3b5ce70994c3c8509390fa3d9eeae 100644 (file)
--- 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 0e6b646897ae1c357b35dee8ae9b610af8a763dc..7b1f8abfda3da48690a8214d86b06e8f9a025791 100644 (file)
--- 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 ab78e881b8acadf0a7086bfd89385012cbea96e9..4326af9d634fb6fbee4c8e8c75d62c82301a5e96 100644 (file)
--- 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 7837c5d564f0ad2461cdab8ec60a684033a2f773..0a7f27402b05e0cc9f4fcd7457a2ddfc90b76fd1 100644 (file)
--- 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 f8ca7ec0336640fc5577193c47271a7a55bce178..0ec1b32a2d8d00db3c0dd4372ad3d3bbdc785f30 100644 (file)
--- 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 2531f984f04df692887467494f28deb0c1192c3a..83c88204a138b9fd767d7744d6f1fa599b20f856 100644 (file)
--- 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 60026a39b5f4effad224a67b5f528ef5116c8564..fb8882f0d9bf13d5bf2c824ca598efec2272a469 100644 (file)
--- 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 cc87511e1ea685d335a19f1718f30ef6789a594c..309c813bef363009574ff0156129ba3a8b1d5b13 100644 (file)
--- 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 b11ca6e972857b7879b8db032d7f7fa3be36b6ef..5f17bbab1dedf745092d681d0c2efa694d784e20 100644 (file)
--- 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 d3fccf1352e1da5df775927cd99ae7682961e2ec..81c9a50345b51d2c03db24f8187652315cf43a34 100644 (file)
--- 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 647b333285ba94c2196ae69dd42453a2c164d054..f7fabdc8bc89970c5b65ebb4054d8ba8a04c9a7c 100644 (file)
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -1,6 +1,6 @@
 TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
-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 0275f6b2f57f1bea74368652c96e0a404a62c00c..56ef0bf7935e3f51fdb319d218f09b4653f16829 100644 (file)
--- 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/vmware.conf b/conf/machine/vmware.conf
index d318bb7c354e52410b37ff15f7ea2b98d66a3a5c..3c0d8fea13dbdb44165f6502394864bf5555a25f 100644 (file)
--- 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/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
index 91cf0034209a80ebc2e359158525fcec2a9c3ddc..d50d24ecb06bc9c6a028e5dceede2f1d0a13021b 100644 (file)
--- 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 5ea50790725c308e626015904b8f02446bb7e077..51606a6d529239ef289a8fcea2b884cd840c64a5 100644 (file)
--- 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 219d1f301e842c49c9331924b644deb6acf806a0..eb2ddcff69b58d4d1a31e31846f2d18f2334b224 100644 (file)
--- 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 ea61b7a7fd78d35bc8a683aac7bf657162162379..19418a95501fbded778dc311e7ac883dd19afd1b 100644 (file)
--- 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}"