machines: move PACKAGE_EXTRA_ARCHS to tune files

This gets us closer to making including tune-<arch>.inc "just work".
Moving the TARGET_ARCH definitions is something for a follup patch.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf
index 0f5eaca9cc8e9f21dd350dda16d672190e74ca6a..cdd465200c0a581de62c4ee15784cd5294331fce 100644 (file)
--- a/meta/conf/machine/akita.conf
+++ b/meta/conf/machine/akita.conf
@@ -5,7 +5,6 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
-PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 MACHINE_FEATURES += "iwmmxt"
 
 IMAGE_FSTYPES ?= "jffs2"

diff --git a/meta/conf/machine/atom-pc.conf b/meta/conf/machine/atom-pc.conf
index 8cf09b811ec33ee911476e23935528c069fa1718..58c9b0da65330eb3af33df0e06e4d837392b9b59 100644 (file)
--- a/meta/conf/machine/atom-pc.conf
+++ b/meta/conf/machine/atom-pc.conf
@@ -4,7 +4,6 @@
 #@DESCRIPTION: Machine configuration for Intel Atom based PCs. Currently supported machines are the Asus eee901, Acer Aspire One, Toshiba NB305, and Intel BlackSand development board.
 
 TARGET_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS = "x86 core2"
 
 include conf/machine/include/tune-atom.inc
 

diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf
index 1b73250c2461daee8d6fc2662b46a1a535f76616..cb6417b7fb748264ac3859b5a001148c63efee53 100644 (file)
--- a/meta/conf/machine/beagleboard.conf
+++ b/meta/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-kdrive"
 XSERVER = "xserver-kdrive-fbdev"

diff --git a/meta/conf/machine/cm-x270.conf b/meta/conf/machine/cm-x270.conf
index 226942de73ac507e0073d853e10871f9a2435983..9bf7d8f6aefbdc8f1bc5b8f663f2ce8883be7d4e 100644 (file)
--- a/meta/conf/machine/cm-x270.conf
+++ b/meta/conf/machine/cm-x270.conf
@@ -8,9 +8,9 @@ GUI_MACHINE_CLASS ?= "bigscreen"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux ?= "2.6.23"
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 require conf/machine/include/tune-xscale.inc
+PACKAGE_EXTRA_ARCHS += "iwmmxt"
 
 # Console serial port. 
 # If you have a W module, add the following line to your local.conf:

diff --git a/meta/conf/machine/depicture.conf b/meta/conf/machine/depicture.conf
index 333af4f2f22770e634c97b484f2a0ca4a5cecfc0..f72ab2939e231f0d578f8709a4a2e34f479929cb 100644 (file)
--- a/meta/conf/machine/depicture.conf
+++ b/meta/conf/machine/depicture.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for running an ARM 920t in the BBD20EUROU board.
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-arm920t.inc

diff --git a/meta/conf/machine/em-x270.conf b/meta/conf/machine/em-x270.conf
index 47fb8ca533799d89cae63ede063f36eb62b0d12e..9bcec5b74262fed741dc987283569db3ab3c90af 100644 (file)
--- a/meta/conf/machine/em-x270.conf
+++ b/meta/conf/machine/em-x270.conf
@@ -8,7 +8,6 @@
 TARGET_ARCH = "arm"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 require conf/machine/include/tune-xscale.inc

diff --git a/meta/conf/machine/htcuniversal.conf b/meta/conf/machine/htcuniversal.conf
index 2f5b798bff67b1da14c01705e0e5f8f4c62e7fde..72f3bc4aadafb12facde1d51b91ec3b40a9a2143 100644 (file)
--- a/meta/conf/machine/htcuniversal.conf
+++ b/meta/conf/machine/htcuniversal.conf
@@ -4,9 +4,9 @@
 
 #include conf/machine/include/tune-iwmmxt.inc
 include conf/machine/include/tune-xscale.inc
+PACKAGE_EXTRA_ARCHS += "iwmmxt"
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te iwmmxt"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 

diff --git a/meta/conf/machine/hx2000.conf b/meta/conf/machine/hx2000.conf
index 8b4c39f80537a5e8bee8432b59660847400b4dd9..a6775f2c3a85262f10d4fbcc92e42c27259ae50e 100644 (file)
--- a/meta/conf/machine/hx2000.conf
+++ b/meta/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/meta/conf/machine/igep0020.conf b/meta/conf/machine/igep0020.conf
index 9ddbad65b37926fb4fd40359347abfa3711c3f18..86adfcf1a0445f5a8d63d53948281af43fe49002 100644 (file)
--- a/meta/conf/machine/igep0020.conf
+++ b/meta/conf/machine/igep0020.conf
@@ -2,7 +2,6 @@
 #@NAME: IGEP v2 machine
 #@DESCRIPTION: Machine configuration for the IGEP v2 board (http://www.myigep.com)
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
 
 # Floating point option
 TARGET_FPU_arm = "hard"

diff --git a/meta/conf/machine/igep0030.conf b/meta/conf/machine/igep0030.conf
index 7ebfaa0ca5b8f97d99ba66582f178250221e7163..af36982a6a3af860699af2c1b745c7827cd036ba 100644 (file)
--- a/meta/conf/machine/igep0030.conf
+++ b/meta/conf/machine/igep0030.conf
@@ -2,7 +2,6 @@
 #@NAME: OMAP3 IGEP module
 #@DESCRIPTION: Machine configuration for the OMAP3 IGEP module (http://www.myigep.com)
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
 
 # Floating point option
 TARGET_FPU_arm = "hard"

diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index be5aedc509c022ecf94b73701acb7a89921c6dc5..a7717510e60b09857c8928058df3af9079889482 100644 (file)
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -4,5 +4,6 @@ FEED_ARCH = "armv6"
 BASE_PACKAGE_ARCH = "armv6"
 
 ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6"
 
 require conf/machine/include/tune-thumb.inc

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

diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc
index e80ef1049043d2236914a65d757887ce445906f1..f41e460999eec0b482901bfec5f135c60f2e1497 100644 (file)
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/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/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc
index 39e4493014570889b786f871cfaa4d6bb8b0ac44..d788b5304f869a420d570111337859c88ba6e3fd 100644 (file)
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
@@ -1,2 +1,4 @@
+FEED_ARCH = "armv4t"
 BASE_PACKAGE_ARCH = "armv4t"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t"
 TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"

diff --git a/meta/conf/machine/include/tune-armv7.inc b/meta/conf/machine/include/tune-armv7.inc
index 96c8c64904909a8851521f476e9db01f2b3217ae..379a3eb011dfcb50373746611c5aebf51beda226 100644 (file)
--- a/meta/conf/machine/include/tune-armv7.inc
+++ b/meta/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/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/tune-atom.inc
index 0f09e8d56f7685b20d0cb74a5b7c28243396173e..a401856c8bd2b8dc9698b9743ac54d8eed831b51 100644 (file)
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/meta/conf/machine/include/tune-atom.inc
@@ -2,3 +2,4 @@ BASE_PACKAGE_ARCH = "core2"
 TARGET_CC_ARCH = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse"
 #MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables"
 
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586 core2"

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

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

diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
index 2cfdf5270f13ebcdfcb2b68b669da2ebbf160d30..d0c5bb2e989166af3569c35b93104b8bfd910bd7 100644 (file)
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -2,5 +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 += "armv4t ep9312"
 BASE_PACKAGE_ARCH = "ep9312"
+FEED_ARCH = "ep9312"
 

diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc
index 49e560ea1a801cc5af0c09687f6b2a122d36004f..f7291be805203e03f139e335243025071d502e6d 100644 (file)
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/meta/conf/machine/include/tune-iwmmxt.inc
@@ -2,5 +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/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index 93da66b1588c169992c28d3e9013dd13acbe6668..67edca2530436e920224278865aa6408a456d537 100644 (file)
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -1 +1,3 @@
 TARGET_CC_ARCH = "-march=mips32"
+FEED_ARCH = "${TARGET_ARCH}"
+BASE_PACKAGE_ARCH = "${TARGET_ARCH}"

diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index a4a68d60e3925f1a87ef971a713ceaa73ed3d5aa..15a72d10a187a1b153d6d11bdb62ab25c092ecec 100644 (file)
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -1,2 +1,4 @@
-TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
+TARGET_CC_ARCH = "-mcpu=603e  -mhard-float"
 BASE_PACKAGE_ARCH = "ppc603e"
+FEED_ARCH = "ppc603e"
+PACKAGE_EXTRA_ARCHS += "ppc603e"

diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index 067a7b100c1913227600508dc11fa3b212a8de72..2956875186092f74c542b33260a2f715578c286d 100644 (file)
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float"
 BASE_PACKAGE_ARCH = "ppce300"
+PACKAGE_EXTRA_ARCHS += "ppce300"

diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index 24821964241073c27179fd0170e9f97d27da1170..44f8742f9ff8b6593adb2be954b1ffb56f600cf6 100644 (file)
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -1,2 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=8540"
 BASE_PACKAGE_ARCH = "ppce500"
+FEED_ARCH = "ppce500"
+PACKAGE_EXTRA_ARCHS += "ppce500"

diff --git a/meta/conf/machine/include/tune-sh3.inc b/meta/conf/machine/include/tune-sh3.inc
index 192dd8fd22e9e5c05ef7422ddbdd0d1480e21bb6..32801a61c33238e815f2b8178c53d9cb4755dc95 100644 (file)
--- a/meta/conf/machine/include/tune-sh3.inc
+++ b/meta/conf/machine/include/tune-sh3.inc
@@ -1 +1,3 @@
 TARGET_CC_ARCH = "-ml -m3"
+FEED_ARCH = "sh3"
+BASE_PACKAGE_ARCH = "sh3"

diff --git a/meta/conf/machine/include/tune-sh4.inc b/meta/conf/machine/include/tune-sh4.inc
index 866f7f89d5e29e617d4b20bed8e37d327bffb640..51b40691bcca2a8eed1803ad5a094b46d9c5ab25 100644 (file)
--- a/meta/conf/machine/include/tune-sh4.inc
+++ b/meta/conf/machine/include/tune-sh4.inc
@@ -1 +1,7 @@
+# NOTE: If you want to optimize to sh4a, conf/machine/include/tune-sh4a.inc.
+# But it is not compatible for sh4.
+# The binary optimized by m4a doesn't operate on sh4. It works on sh4a only.
+
 TARGET_CC_ARCH = "-ml -m4"
+FEED_ARCH = "sh4"
+BASE_PACKAGE_ARCH = "sh4"

diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc
index 10133c6c214f092f0cae47687f6badbd7c8153e8..a402e7cd2b4f33d526159f09985437b712efd7af 100644 (file)
--- a/meta/conf/machine/include/tune-supersparc.inc
+++ b/meta/conf/machine/include/tune-supersparc.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=supersparc"
-BASE_PACKAGE_ARCH = "supersparc" 
+BASE_PACKAGE_ARCH = "supersparc"
+FEED_ARCH = "supersparc" 

diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 4f96814a7212c4de0b2c2045e0c73803f52a65db..f1ef3d46afa607bde4ad9a98ac499a6ea0fa591e 100644 (file)
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -5,6 +5,7 @@ INHERIT += "siteinfo"
 TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
 TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
 BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+PACKAGE_EXTRA_ARCHS += "${@['armv4b armv4tb armv5teb', 'armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
 
 # webkit-gtk has alignment issues with double instructions on armv5 so
 # disable them here

diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta/conf/machine/mpc8315e-rdb.conf
index 1b7982a5ddb71d6d46d3492681966e5d41149cbf..919a95d9efd34e525042547bdef07dadf8060ac8 100644 (file)
--- a/meta/conf/machine/mpc8315e-rdb.conf
+++ b/meta/conf/machine/mpc8315e-rdb.conf
@@ -2,7 +2,6 @@
 #@DESCRIPTION: Machine configuration for running 
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc603e"
 TARGET_FPU = "spe"
 
 require conf/machine/include/tune-ppc603e.inc

diff --git a/meta/conf/machine/mx31ads.conf b/meta/conf/machine/mx31ads.conf
index 04a238d600ad016f34442d96304798f38622560d..8b3e3dbc1af244f271277c9989e9207079d5a8a3 100644 (file)
--- a/meta/conf/machine/mx31ads.conf
+++ b/meta/conf/machine/mx31ads.conf
@@ -2,7 +2,6 @@
 #@NAME: Freescale imx31 ADS Board
 #@DESCRIPTION: Machine configuration for the imx31 based Freescale ADS Board
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mx31"
 

diff --git a/meta/conf/machine/mx31phy.conf b/meta/conf/machine/mx31phy.conf
index 28b255ccec40b6c098f897db8cd02d2c9ff2ab5d..eea673ab162be00936927e8804cb6119aeddea8f 100644 (file)
--- a/meta/conf/machine/mx31phy.conf
+++ b/meta/conf/machine/mx31phy.conf
@@ -2,7 +2,6 @@
 #@NAME: Phytec phyCORE-iMX31 Board
 #@DESCRIPTION: Machine configuration for the imx31 based Phytec phyCORE-iMX31
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mx31"
 

diff --git a/meta/conf/machine/omap-3430ldp.conf b/meta/conf/machine/omap-3430ldp.conf
index 0be0546b80a732d8247dcc0f003612a883582723..759d58f01544d3a4327e49680eb5aaa85d57e498 100644 (file)
--- a/meta/conf/machine/omap-3430ldp.conf
+++ b/meta/conf/machine/omap-3430ldp.conf
@@ -2,7 +2,6 @@
 #@NAME: TI OMAP 3430 LDP
 #@DESCRIPTION: Machine configuration for the TI OMAP 3430 LDP (aka OMAP Zoom)
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7a"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 

diff --git a/meta/conf/machine/omap-3430sdp.conf b/meta/conf/machine/omap-3430sdp.conf
index 5d87bd14837eb3b98b3fb136dc2c341155e03804..651d6a996875a81335990e9fff23ffae1e656d0a 100644 (file)
--- a/meta/conf/machine/omap-3430sdp.conf
+++ b/meta/conf/machine/omap-3430sdp.conf
@@ -2,7 +2,6 @@
 #@NAME: TI OMAP 3430 SDP
 #@DESCRIPTION: Machine configuration for the TI OMAP 3430 SDP
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7a"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 

diff --git a/meta/conf/machine/overo.conf b/meta/conf/machine/overo.conf
index dde4bff476a5d019d604905879965c6a25cce202..9fefd73b4862d7d1914915d77df27c87f88e7d0b 100644 (file)
--- a/meta/conf/machine/overo.conf
+++ b/meta/conf/machine/overo.conf
@@ -5,7 +5,6 @@
 include conf/machine/include/tune-cortexa8.inc
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
 
 PREFERRED_VERSION_u-boot = "git"

diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 400ecc82454179ce544fbaf1cf6b8a197d2fe7b5..9fb18932ca890eda5f4a86781dddf561843decad 100644 (file)
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: arm_versaile_926ejs
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-arm926ejs.inc

diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index 0bbeac7da6b6faeabe04da846c6c785d86cdca55..83d08411599940aa4a21ae1fdb3578717c0c5e42 100644 (file)
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc603e"
 
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-ppc603e.inc

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index fd34709b78afed298e58ea3dcfb73f09b1b2293b..182759adfe9a90cf4c84f30260e1bd729eae2e85 100644 (file)
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -4,7 +4,6 @@
 
 TARGET_ARCH = "x86_64"
 TRANSLATED_TARGET_ARCH = "x86-64"
-PACKAGE_EXTRA_ARCHS = "x86"
 
 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"

diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index cb2a32d7bd10c8c893a41faf6268ef416bf4d143..f1a0939ebc21ee08b74c6dc9e8cf4248e15176ee 100644 (file)
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for running a common x86
 
 TARGET_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS = "x86"
 
 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"

diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index 4a794331e824592212ed8120acbb1425a39dc667..faa00e991f14f5ec3e4447f0c20a440f22f0dac4 100644 (file)
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -9,7 +9,6 @@ MACHINE_FEATURES += "iwmmxt"
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
 IMAGE_FSTYPES ?= "tar.gz ext3"
 IMAGE_ROOTFS_SIZE_ext3 = "250000"
 

diff --git a/meta/conf/machine/zoom2.conf b/meta/conf/machine/zoom2.conf
index 142a40c5a12605b1dd2afec5776832e376bb9aba..dec90c2c7bdd9551c1162af31dca4fe88e763336 100644 (file)
--- a/meta/conf/machine/zoom2.conf
+++ b/meta/conf/machine/zoom2.conf
@@ -2,7 +2,6 @@
 #@NAME: Logic PD Zoom2
 #@DESCRIPTION: Machine configuration for the OMAP3-powered Logic PD Zoom2
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7a"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-zoomsync"
 

diff --git a/meta/conf/machine/zylonite.conf b/meta/conf/machine/zylonite.conf
index 644675e84915be6f842974b20bb5f47372504cca..e82f041ff24c61eb32579c6da1f6856a6dc5d586 100644 (file)
--- a/meta/conf/machine/zylonite.conf
+++ b/meta/conf/machine/zylonite.conf
@@ -4,8 +4,9 @@
 
 require conf/machine/include/tune-xscale.inc
 
+PACKAGE_EXTRA_ARCHS += "iwmmxt"
+
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n -x lzo -p"