diff options
57 files changed, 23 insertions, 55 deletions
diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf index 22718b806e..add59a4f45 100644 --- 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 349dd8eddb..e1ad289b40 100644 --- 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 ef7e8a2a39..8ec0d9a999 100644 --- 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 814641df8f..d4712032db 100644 --- 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 16d0705a24..f95fb2da56 100644 --- 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 ba0c9f9a70..59ef577480 100644 --- 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 3b9d5188f6..570ff165f7 100644 --- 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 95c7626a63..9fd34f95a0 100644 --- 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 b119a24359..6247c8322c 100644 --- 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 f875d437c7..9578389890 100644 --- 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 d32578ed87..548cf764d1 100644 --- 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 a1d6d43600..cef6dbc147 100644 --- 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 aadbea4a5f..e01b37d3e6 100644 --- 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 b99b1372be..838dbce62e 100644 --- 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 b279338686..c926c6ff8a 100644 --- 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 efaffb088b..4ead8c1508 100644 --- 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 db9f26861c..65f6584662 100644 --- 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 3cf0a7fab2..f8a5c951b7 100644 --- 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 16d8c7097c..268ed52b61 100644 --- 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 211091d929..f20d6ae8e3 100644 --- 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 e6552b52d1..48beedd175 100644 --- 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 91e3dbb5a0..e362bdec00 100644 --- 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 c6859227cb..a2ca95beac 100644 --- 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 ac4c1ef4b6..db255a670c 100644 --- 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 3536485cab..af4ddea21c 100644 --- 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 439c484970..43d23d8d91 100644 --- 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 99e82d28f4..eec87a3ed5 100644 --- 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 4c7e413fa0..abc17728b5 100644 --- 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 8b9b7ee365..a403008a18 100644 --- 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 03dccedccc..f85b2a12ee 100644 --- 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 a55b75cd89..73fbf1708d 100644 --- 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 4657d48b79..08f61b83ea 100644 --- 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 f7f025413d..a9791dd8ef 100644 --- 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 b3debb633c..d4a0bd19b8 100644 --- 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 f95cb70833..a5178d8c90 100644 --- 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 472e5d69e6..384f1f9d14 100644 --- 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 eba677fae7..1d6cde4536 100644 --- 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 785214409f..ab532e33ff 100644 --- 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 52c2b04690..296ce6a2ed 100644 --- 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 0f5aef5ea4..e7b8f71c33 100644 --- 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 1f7a04bb3b..47275b8cb4 100644 --- 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 e80ef10490..f41e460999 100644 --- 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 50aaec1320..d788b5304f 100644 --- 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 96c8c64904..379a3eb011 100644 --- 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 313300d9cd..9526faad7e 100644 --- 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 43849086f4..136efa247c 100644 --- 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 4216255102..a2ce7def1a 100644 --- 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 7da1cb50c8..39d7f9b797 100644 --- 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 aa5aaee901..f7291be805 100644 --- 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 6b8c9b521f..4e5be154dd 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" diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc index 88fe7d7445..63dda25f58 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" diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc index eb16651ae3..bd445c6385 100644 --- 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 a688f2f64b..a861195dd1 100644 --- 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 09a71535c6..5f965286f6 100644 --- 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 05fb2e19e5..f852a9e82b 100644 --- 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 15126d56a9..8d6073353a 100644 --- 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 afdf0ac621..69b94301e6 100644 --- 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" |