machines: start moving PACKAGE_EXTRA_ARCHS into the appropriate tune files

* machine maintainers are encouraged to fix their machines

diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf
index 22718b806e4278c5f9b668bcad73a22b78133121..add59a4f455a39728eea5d762eeca59ba3d445fa 100644 (file)
--- a/conf/machine/acern30.conf
+++ b/conf/machine/acern30.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/amsdelta.conf b/conf/machine/amsdelta.conf
index 349dd8eddb02b153be6ffc434b91bff4734c4760..e1ad289b400ad94a2bdbd3a13dd01212498c2e49 100644 (file)
--- a/conf/machine/amsdelta.conf
+++ b/conf/machine/amsdelta.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Amstrad E3
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"

diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf
index ef7e8a2a39ec6f7833dbf276b7d056bb7f7e0d13..8ec0d9a999005e6f1ade9608d2de81b0da259f0d 100644 (file)
--- a/conf/machine/asus620.conf
+++ b/conf/machine/asus620.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/asus730.conf b/conf/machine/asus730.conf
index 814641df8f710510585cb6b5f1c4fe506d95135c..d4712032db962b7499acf1328a3f9ae57257082f 100644 (file)
--- a/conf/machine/asus730.conf
+++ b/conf/machine/asus730.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+PACKAGE_EXTRA_ARCHS = "iwmmxt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc

diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf
index 16d0705a24a646f68399d6a68197cfb39f5b48fd..f95fb2da569812c5f3775e000fda1b2627653e4f 100644 (file)
--- a/conf/machine/at91-l9260.conf
+++ b/conf/machine/at91-l9260.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.25"

diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index ba0c9f9a708b12c69f8d0305d8e8bf32fae45be2..59ef5774809da27b28b3a36c3ae483b7f4627da2 100644 (file)
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"

diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index 3b9d5188f6d86f28033af79a40b5837a02a0e512..570ff165f757381972f64a2c93d7784f77200478 100644 (file)
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"

diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index 95c7626a63a1ac096ebc209bab7a186e97db54a8..9fd34f95a0dc26ea413396dba07713b4d67f175f 100644 (file)
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the at91sam9263ek development board with a at91sam9263 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"

diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index b119a24359bae1f22dec095a86c95f71a85414f5..6247c8322c1145de99f0763ed700f18ea061f1b9 100644 (file)
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
+PACKAGE_EXTRA_ARCHS = " iwmmxt "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc

diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf
index f875d437c7b33387209c4b470a38f914cf8b85c9..9578389890bf69ed8236ce62ffe129f058ff7fa4 100644 (file)
--- a/conf/machine/bd-neon.conf
+++ b/conf/machine/bd-neon.conf
@@ -6,7 +6,6 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc

diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index d32578ed8777404f576c868e8b5e41d13e5d72d9..548cf764d15237cc91feafc06c6e8915f22a815f 100644 (file)
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -2,7 +2,6 @@
 #@NAME: Beagleboard machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
@@ -29,7 +28,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 SERIAL_CONSOLE = "115200 ttyS2"
 
 # No kernel recipe yet
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
 
 KERNEL_IMAGETYPE = "uImage"
 

diff --git a/conf/machine/chumby.conf b/conf/machine/chumby.conf
index a1d6d436007fb24cb40406b1a4e17839e0d27024..cef6dbc14779f48e8ce6d35278cb77654bb51724 100644 (file)
--- a/conf/machine/chumby.conf
+++ b/conf/machine/chumby.conf
@@ -7,7 +7,6 @@ TARGET_ARCH = "arm"
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth ext2 vfat touchscreen usbhost usbgadget wifi"
 
 GUI_MACHINE_CLASS = "smallscreen"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 

diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf
index aadbea4a5f8a1644be1771c69729b42dc5346e6c..e01b37d3e6d8daa268bf715bafe7f30550d5bd9d 100644 (file)
--- a/conf/machine/cm-x270.conf
+++ b/conf/machine/cm-x270.conf
@@ -7,7 +7,7 @@ GUI_MACHINE_CLASS ?= "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+PACKAGE_EXTRA_ARCHS = " iwmmxt"
 
 require conf/machine/include/tune-xscale.inc
 

diff --git a/conf/machine/cs-e9302.conf b/conf/machine/cs-e9302.conf
index b99b1372be9026ff3f16d51838c22a1c53e2bf2d..838dbce62e46aa4cabe1c0d2f57d37f062ede37a 100644 (file)
--- a/conf/machine/cs-e9302.conf
+++ b/conf/machine/cs-e9302.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for Olimex CS-E9302 Development Platform
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 

diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
index b279338686f2475effa6fb5c58b37d8cb64552bc..c926c6ff8a5b0dee4506c5381c85b590bcf370f0 100644 (file)
--- a/conf/machine/davinci-dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI Davinci EVM board
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 HOTPLUG = "udev"
 

diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index efaffb088bc3aa2d6ef558f9efabfbe4a9f1cfac..4ead8c1508f7469850f6c547743b8e34ec52df57 100644 (file)
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Lyrtech Small Form Factor SDR board
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 HOTPLUG = "udev"
 

diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index db9f26861cf54e1239fbfc8a15e41c24a577ada8..65f65846620e47a3f29ca43a4d19989c07b9ffcb 100644 (file)
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -5,7 +5,6 @@
 TARGET_ARCH = "arm"
 
 GUI_MACHINE_CLASS = "bigscreen"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"

diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf
index 3cf0a7fab27520d6639dcc54d117a4e05bb7c524..f8a5c951b7c843537dec8ea15bce3598bcd594d6 100644 (file)
--- a/conf/machine/em-x270.conf
+++ b/conf/machine/em-x270.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
+PACKAGE_EXTRA_ARCHS = "iwmmxt "
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.

diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 16d8c7097c4fe4e089d2eae4a0f227ab56db01ff..268ed52b615b96a712a1c52437126a92f0bf7ebb 100644 (file)
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -4,7 +4,6 @@
 
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"

diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf
index 211091d929645ea4de8ae3dc73c2c03cef694643..f20d6ae8e3f53a5bc26879850deef12bcc7f3d36 100644 (file)
--- a/conf/machine/er0100.conf
+++ b/conf/machine/er0100.conf
@@ -9,7 +9,6 @@
 # CPU: Intel (now Marvell) PXA255
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc

diff --git a/conf/machine/eseries.conf b/conf/machine/eseries.conf
index e6552b52d15332642c3c63eff9ad0f0ea1a5e84b..48beedd1754af0bbbcc411220f58d70d9853c105 100644 (file)
--- a/conf/machine/eseries.conf
+++ b/conf/machine/eseries.conf
@@ -6,7 +6,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/eteng500.conf b/conf/machine/eteng500.conf
index 91e3dbb5a021ff58ae04ff2bbfe764d87970b219..e362bdec001abc36f5002cb289eac06a7b130ec1 100644 (file)
--- a/conf/machine/eteng500.conf
+++ b/conf/machine/eteng500.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/fsg3be.conf b/conf/machine/fsg3be.conf
index c6859227cbe0dfd7ddfabf2a7815a26924244d47..a2ca95beac91e3fdcb786164b2e195e0647b4295 100644 (file)
--- a/conf/machine/fsg3be.conf
+++ b/conf/machine/fsg3be.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "armeb"
 
-PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
+PACKAGE_EXTRA_ARCHS = "ixp4xxbe"
 
 MACHINE_ARCH = "ixp4xxbe"
 

diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf
index ac4c1ef4b6d7a33f433dce1dd592f7d3d6c03d75..db255a670c87ab77bc821f9d459da7868b59eee8 100644 (file)
--- a/conf/machine/gesbc-9302.conf
+++ b/conf/machine/gesbc-9302.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Low cost SBC based on Cirrus Logic EP9302 CPU
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux ?= "2.6.24"

diff --git a/conf/machine/ghi270.conf b/conf/machine/ghi270.conf
index 3536485cabda822358fc6182de66fe21b450df8e..af4ddea21cc988d421e78839e70f901f37a15d65 100644 (file)
--- a/conf/machine/ghi270.conf
+++ b/conf/machine/ghi270.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
+PACKAGE_EXTRA_ARCHS = " iwmmxt "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc

diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 439c484970780a357fefdda70f84ace1ac9a38b9..43d23d8d911e60b6532473280b848b263d3cc9c5 100644 (file)
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.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/h1940.conf b/conf/machine/h1940.conf
index 99e82d28f4599373c61f98b82b4563293bde9fc5..eec87a3ed5b0f11a2df5054d949ad3274b4b3e42 100644 (file)
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -2,7 +2,6 @@
 #@NAME: h1940
 #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 TARGET_ARCH = "arm"
 
 # Set preferred providers

diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 4c7e413fa02b1ef3e6610cd723cfddc5e933892c..abc17728b57c75a73ad679021b98ca7089e00a50 100644 (file)
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -6,7 +6,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/h3900.conf b/conf/machine/h3900.conf
index 8b9b7ee365991d408e6a72a628f1444eb2582ef8..a403008a183e287f05b699d5c827d9e66619b73f 100644 (file)
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.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/h4000.conf b/conf/machine/h4000.conf
index 03dccedcccc21af06c16797766af44ee96f649f3..f85b2a12eea44e4f582393aa402c4c35cea63eb3 100644 (file)
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.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/h5000.conf b/conf/machine/h5000.conf
index a55b75cd893bbb10e9e8159539248262ecac1415..73fbf1708d38efc947af7fe1b0b048884b9ecf9c 100644 (file)
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.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/h6300.conf b/conf/machine/h6300.conf
index 4657d48b7925c3af44b9d156dc6f9f55c1ae64c2..08f61b83ea1eb36fd96626aea731709aee6104f3 100644 (file)
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -7,7 +7,6 @@
 #
 TARGET_ARCH = "arm"
 BASE_PACKAGE_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
 require conf/machine/include/tune-arm9tdmi.inc

diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
index f7f025413d96b0db038768b2005df4c9fdc11645..a9791dd8ef57f77b34a75ef7d90f7fb99da61020 100644 (file)
--- a/conf/machine/htcalpine.conf
+++ b/conf/machine/htcalpine.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/htcapache.conf b/conf/machine/htcapache.conf
index b3debb633cb622a63d6cdb8da46172125587bab3..d4a0bd19b8eb9eb07c7b1594d1cf1fd80b258719 100644 (file)
--- a/conf/machine/htcapache.conf
+++ b/conf/machine/htcapache.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/htcblueangel.conf b/conf/machine/htcblueangel.conf
index f95cb7083331f149dddedb60e6aa486a7d72d2cb..a5178d8c90090c7a6e30475f2a0c92b0d2c47bf3 100644 (file)
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.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/htchimalaya.conf b/conf/machine/htchimalaya.conf
index 472e5d69e69d9f6d9fdb4c0d94b395f845603a98..384f1f9d145f8adedc79e159cbbc5f82e3e5359f 100644 (file)
--- a/conf/machine/htchimalaya.conf
+++ b/conf/machine/htchimalaya.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/htckaiser.conf b/conf/machine/htckaiser.conf
index eba677fae7fa89b775559ab7ea0cb797119f4635..1d6cde45361053eab04f703da31505c15ab1b33c 100644 (file)
--- a/conf/machine/htckaiser.conf
+++ b/conf/machine/htckaiser.conf
@@ -2,7 +2,6 @@
 #@NAME: HTC Kaiser phone
 #@DESCRIPTION: Machine configuration for HTC Kaiser phone
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
  
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
@@ -11,10 +10,7 @@ GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
  
-TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
-FEED_ARCH = "armv6"
-BASE_PACKAGE_ARCH = "armv6"
- 
+require conf/machine/include/tune-arm1136jf-s.inc
 
 IMAGE_FSTYPES ?= "tar.gz cpio.gz"
  

diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 785214409f1c28f2f248591ba45b7d76c0d7a639..ab532e33ff992fdad21c4220be35fbb86037ccfd 100644 (file)
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
+PACKAGE_EXTRA_ARCHS = " iwmmxt  "
 
 IMAGE_FSTYPES += "jffs2"
 

diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 52c2b046908ba10cfaca4f8af7d6596e0b2f4280..296ce6a2edb9be8a5062b858eb796e9e2bab75f3 100644 (file)
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -1,5 +1,4 @@
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx"

diff --git a/conf/machine/include/tune-arm1136jf-s.inc b/conf/machine/include/tune-arm1136jf-s.inc
index 0f5aef5ea4cb090dd5ef87bbe4036218032f656b..e7b8f71c338ec979176af785f9da8eae829c19da 100644 (file)
--- a/conf/machine/include/tune-arm1136jf-s.inc
+++ b/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,3 +1,5 @@
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv6"
 BASE_PACKAGE_ARCH = "armv6"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6"
+

diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc
index 1f7a04bb3b905cc24609562440ec2143d0fd530d..47275b8cb4bc0d3a694e3292c12de52b6ed90914 100644 (file)
--- a/conf/machine/include/tune-arm920t.inc
+++ b/conf/machine/include/tune-arm920t.inc
@@ -1,4 +1,5 @@
 FEED_ARCH = "armv4t"
 BASE_PACKAGE_ARCH = "armv4t" 
 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t"
 

diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc
index e80ef1049043d2236914a65d757887ce445906f1..f41e460999eec0b482901bfec5f135c60f2e1497 100644 (file)
--- a/conf/machine/include/tune-arm926ejs.inc
+++ b/conf/machine/include/tune-arm926ejs.inc
@@ -1,5 +1,5 @@
 FEED_ARCH = "armv5te"
-
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te"
 # For gcc 3.x you need:
 #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 # For gcc 4.x you need:

diff --git a/conf/machine/include/tune-arm9tdmi.inc b/conf/machine/include/tune-arm9tdmi.inc
index 50aaec1320bc3a5d79da123028c82b00d5f8d1a3..d788b5304f869a420d570111337859c88ba6e3fd 100644 (file)
--- a/conf/machine/include/tune-arm9tdmi.inc
+++ b/conf/machine/include/tune-arm9tdmi.inc
@@ -1,3 +1,4 @@
 FEED_ARCH = "armv4t"
 BASE_PACKAGE_ARCH = "armv4t"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t"
 TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"

diff --git a/conf/machine/include/tune-armv7.inc b/conf/machine/include/tune-armv7.inc
index 96c8c64904909a8851521f476e9db01f2b3217ae..379a3eb011dfcb50373746611c5aebf51beda226 100644 (file)
--- a/conf/machine/include/tune-armv7.inc
+++ b/conf/machine/include/tune-armv7.inc
@@ -3,4 +3,5 @@
 # This will NOT compile programs in 'ARM' mode, which is what you really want
 TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv7"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7"
 BASE_PACKAGE_ARCH = "armv7"

diff --git a/conf/machine/include/tune-athlonmp.inc b/conf/machine/include/tune-athlonmp.inc
index 313300d9cd0e35e01e02481a318702ad7d757671..9526faad7effae4f68e89fe3b53ea1176de44b4c 100644 (file)
--- a/conf/machine/include/tune-athlonmp.inc
+++ b/conf/machine/include/tune-athlonmp.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-march=i686"
+PACKAGE_EXTRA_ARCHS += "i386 i486 i586"
 BASE_PACKAGE_ARCH = "i686"
 FEED_ARCH = "i686"

diff --git a/conf/machine/include/tune-c3.inc b/conf/machine/include/tune-c3.inc
index 43849086f4d30013be06c51d19f90057511a47be..136efa247c563bad98c1a1991665875652471e7e 100644 (file)
--- a/conf/machine/include/tune-c3.inc
+++ b/conf/machine/include/tune-c3.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-march=c3 -mtune=c3"
+PACKAGE_EXTRA_ARCHS += "i386 i486"
 BASE_PACKAGE_ARCH = "i586"
 FEED_ARCH = "i586"

diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index 4216255102078790af16c5f49230d2e0477fa052..a2ce7def1a8977921d16f53d74b6ad18b3b4db2c 100644 (file)
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/conf/machine/include/tune-cortexa8.inc
@@ -5,4 +5,5 @@
 
 TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
 FEED_ARCH = "armv7a"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7 armv7a"
 BASE_PACKAGE_ARCH = "armv7a"

diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc
index 7da1cb50c8b6aa519913a75406f44aad3f9b7603..39d7f9b79730103b15c1f6ecf3fc91c7077939c3 100644 (file)
--- a/conf/machine/include/tune-ep9312.inc
+++ b/conf/machine/include/tune-ep9312.inc
@@ -2,6 +2,7 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
 # add "-mfp=maverick" for newer gcc versions > 4.0
 
 #set arch to ep9312 for all generated packages
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t ep9312"
 BASE_PACKAGE_ARCH = "ep9312"
 FEED_ARCH = "ep9312"
 

diff --git a/conf/machine/include/tune-iwmmxt.inc b/conf/machine/include/tune-iwmmxt.inc
index aa5aaee9018125a8d5b6a862e0e950e5b86e6d59..f7291be805203e03f139e335243025071d502e6d 100644 (file)
--- a/conf/machine/include/tune-iwmmxt.inc
+++ b/conf/machine/include/tune-iwmmxt.inc
@@ -2,6 +2,6 @@
 # Please use tune-xscale for PXA255/PXA26x based processors.
 TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
 BASE_PACKAGE_ARCH = "iwmmxt"
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te iwmmxt"
 FEED_ARCH = "iwmmxt"
 

diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
index 6b8c9b521f42d11149834280314187aea9c5f44d..4e5be154ddc4cd98e538705640f3f1e769b07204 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"

diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
index 88fe7d7445910f74be8ac8ff85d142870fb72797..63dda25f581444af288aed0bd6da76aad17bca91 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"

diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc
index eb16651ae37ea1d891554210a24a5e37ee33ecb9..bd445c63858ce6a3dddfc9cd968cfce5e8f2e15e 100644 (file)
--- a/conf/machine/include/tune-xscale.inc
+++ b/conf/machine/include/tune-xscale.inc
@@ -2,4 +2,5 @@ FEED_ARCH =  "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d,
 
 TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
 TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
+PACKAGE_EXTRA_ARCHS += "${@['armv4b armv4tb armv5teb', 'armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
 BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index a688f2f64b68e0b7de8eb634813c021e63b7d7b6..a861195dd1edebfde5fc4cf3b9de8e1961355667 100644 (file)
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -2,7 +2,6 @@
 # Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 PACKAGE_EXTRA_ARCHS_collie = ""
 
 MACHINE_KERNEL_VERSION = "2.6"

diff --git a/conf/machine/neuros-osd.conf b/conf/machine/neuros-osd.conf
index 09a71535c68ff3ff7ff83bd2d9fd8b68355cbb05..5f965286f6883efbc6fc4c06d7ead494b4ca2202 100644 (file)
--- a/conf/machine/neuros-osd.conf
+++ b/conf/machine/neuros-osd.conf
@@ -4,8 +4,6 @@
 
 TARGET_ARCH = "arm"
 
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
 

diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
index 05fb2e19e5ba6b1d92a953be9c2375e0d0a021dc..f852a9e82b82fc26322b0d8d9da6bef6026c16d5 100644 (file)
--- a/conf/machine/neuros-osd2.conf
+++ b/conf/machine/neuros-osd2.conf
@@ -4,8 +4,6 @@
 
 TARGET_ARCH = "arm"
 
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
 

diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 15126d56a9a3d74af2486d5efe0ae1d87f5ed007..8d6073353a291a5ee341b3452be33578b83e7179 100644 (file)
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -2,7 +2,6 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
 PREFERRED_PROVIDER_virtual/bootloader = ""

diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
index afdf0ac621f46533f723ecb911f99d4ad5f84a2c..69b94301e67684dcefffa7acca1d94f9de361be7 100644 (file)
--- a/conf/machine/nokia800.conf
+++ b/conf/machine/nokia800.conf
@@ -2,7 +2,6 @@
 #@NAME: Nokia 800 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 800
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
 XSERVER = "xserver-kdrive-xomap"