sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Koen Kooi 2011-01-09 09:41:33 +01:00 committed by Richard Purdie
parent c02f89fe24
commit 38b25eed95
41 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/conf/machine/akita.conf
View File

@ -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"

1
meta/conf/machine/atom-pc.conf
View File

@ -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

1
meta/conf/machine/beagleboard.conf
View File

@ -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"

2
meta/conf/machine/cm-x270.conf
View File

@ -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:

1
meta/conf/machine/depicture.conf
View File

@ -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

1
meta/conf/machine/em-x270.conf
View File

@ -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

2
meta/conf/machine/htcuniversal.conf
View File

@ -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"

2
meta/conf/machine/hx2000.conf
View File

@ -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"

1
meta/conf/machine/igep0020.conf
View File

@ -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"

1
meta/conf/machine/igep0030.conf
View File

@ -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"

1
meta/conf/machine/include/tune-arm1136jf-s.inc
View File

@ -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

2
meta/conf/machine/include/tune-arm920t.inc
View File

@ -1,4 +1,4 @@
FEED_ARCH = "armv4t"
BASE_PACKAGE_ARCH = "armv4t"
TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
PACKAGE_EXTRA_ARCHS += "armv4 armv4t"

2
meta/conf/machine/include/tune-arm926ejs.inc
View File

@ -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:

2
meta/conf/machine/include/tune-arm9tdmi.inc
View File

@ -1,2 +1,4 @@
FEED_ARCH = "armv4t"
BASE_PACKAGE_ARCH = "armv4t"
PACKAGE_EXTRA_ARCHS += "armv4 armv4t"
TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"

1
meta/conf/machine/include/tune-armv7.inc
View File

@ -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"

1
meta/conf/machine/include/tune-atom.inc
View File

@ -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"

3
meta/conf/machine/include/tune-c3.inc
View File

@ -1,3 +1,4 @@
TARGET_CC_ARCH = "-march=c3 -mtune=c3"
PACKAGE_EXTRA_ARCHS += "i386 i486 i586"
BASE_PACKAGE_ARCH = "i586"
FEED_ARCH = "i586"

1
meta/conf/machine/include/tune-cortexa8.inc
View File

@ -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"

2
meta/conf/machine/include/tune-ep9312.inc
View File

@ -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"

3
meta/conf/machine/include/tune-iwmmxt.inc
View File

@ -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"

2
meta/conf/machine/include/tune-mips32.inc
View File

@ -1 +1,3 @@
TARGET_CC_ARCH = "-march=mips32"
FEED_ARCH = "${TARGET_ARCH}"
BASE_PACKAGE_ARCH = "${TARGET_ARCH}"

4
meta/conf/machine/include/tune-ppc603e.inc
View File

@ -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"

1
meta/conf/machine/include/tune-ppce300c2.inc
View File

@ -1,2 +1,3 @@
TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float"
BASE_PACKAGE_ARCH = "ppce300"
PACKAGE_EXTRA_ARCHS += "ppce300"

2
meta/conf/machine/include/tune-ppce500.inc
View File

@ -1,2 +1,4 @@
TARGET_CC_ARCH = "-mcpu=8540"
BASE_PACKAGE_ARCH = "ppce500"
FEED_ARCH = "ppce500"
PACKAGE_EXTRA_ARCHS += "ppce500"

2
meta/conf/machine/include/tune-sh3.inc
View File

@ -1 +1,3 @@
TARGET_CC_ARCH = "-ml -m3"
FEED_ARCH = "sh3"
BASE_PACKAGE_ARCH = "sh3"

6
meta/conf/machine/include/tune-sh4.inc
View File

@ -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"

3
meta/conf/machine/include/tune-supersparc.inc
View File

@ -1,2 +1,3 @@
TARGET_CC_ARCH = "-mcpu=supersparc"
BASE_PACKAGE_ARCH = "supersparc"
BASE_PACKAGE_ARCH = "supersparc"
FEED_ARCH = "supersparc"

1
meta/conf/machine/include/tune-xscale.inc
View File

@ -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

1
meta/conf/machine/mpc8315e-rdb.conf
View File

@ -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

1
meta/conf/machine/mx31ads.conf
View File

@ -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"

1
meta/conf/machine/mx31phy.conf
View File

@ -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"

1
meta/conf/machine/omap-3430ldp.conf
View File

@ -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"

1
meta/conf/machine/omap-3430sdp.conf
View File

@ -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"

1
meta/conf/machine/overo.conf
View File

@ -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"

1
meta/conf/machine/qemuarm.conf
View File

@ -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

1
meta/conf/machine/qemuppc.conf
View File

@ -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

1
meta/conf/machine/qemux86-64.conf
View File

@ -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"

1
meta/conf/machine/qemux86.conf
View File

@ -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"

1
meta/conf/machine/spitz.conf
View File

@ -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"

1
meta/conf/machine/zoom2.conf
View File

@ -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"

3
meta/conf/machine/zylonite.conf
View File

@ -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"