diff options
Diffstat (limited to 'meta/conf/machine')
41 files changed, 38 insertions, 29 deletions
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf index 0f5eaca9cc..cdd465200c 100644 --- a/meta/conf/machine/akita.conf +++ b/meta/conf/machine/akita.conf | |||
@@ -5,7 +5,6 @@ | |||
5 | require conf/machine/include/zaurus-2.6.inc | 5 | require conf/machine/include/zaurus-2.6.inc |
6 | require conf/machine/include/zaurus-clamshell.inc | 6 | require conf/machine/include/zaurus-clamshell.inc |
7 | 7 | ||
8 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | ||
9 | MACHINE_FEATURES += "iwmmxt" | 8 | MACHINE_FEATURES += "iwmmxt" |
10 | 9 | ||
11 | IMAGE_FSTYPES ?= "jffs2" | 10 | IMAGE_FSTYPES ?= "jffs2" |
diff --git a/meta/conf/machine/atom-pc.conf b/meta/conf/machine/atom-pc.conf index 8cf09b811e..58c9b0da65 100644 --- a/meta/conf/machine/atom-pc.conf +++ b/meta/conf/machine/atom-pc.conf | |||
@@ -4,7 +4,6 @@ | |||
4 | #@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. | 4 | #@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. |
5 | 5 | ||
6 | TARGET_ARCH = "i586" | 6 | TARGET_ARCH = "i586" |
7 | PACKAGE_EXTRA_ARCHS = "x86 core2" | ||
8 | 7 | ||
9 | include conf/machine/include/tune-atom.inc | 8 | include conf/machine/include/tune-atom.inc |
10 | 9 | ||
diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf index 1b73250c24..cb6417b7fb 100644 --- a/meta/conf/machine/beagleboard.conf +++ b/meta/conf/machine/beagleboard.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: Beagleboard machine | 2 | #@NAME: Beagleboard machine |
3 | #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board | 3 | #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a" | ||
6 | 5 | ||
7 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" | 6 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" |
8 | XSERVER = "xserver-kdrive-fbdev" | 7 | XSERVER = "xserver-kdrive-fbdev" |
diff --git a/meta/conf/machine/cm-x270.conf b/meta/conf/machine/cm-x270.conf index 226942de73..9bf7d8f6ae 100644 --- a/meta/conf/machine/cm-x270.conf +++ b/meta/conf/machine/cm-x270.conf | |||
@@ -8,9 +8,9 @@ GUI_MACHINE_CLASS ?= "bigscreen" | |||
8 | PREFERRED_PROVIDER_virtual/kernel = "linux" | 8 | PREFERRED_PROVIDER_virtual/kernel = "linux" |
9 | PREFERRED_VERSION_linux ?= "2.6.23" | 9 | PREFERRED_VERSION_linux ?= "2.6.23" |
10 | 10 | ||
11 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" | ||
12 | 11 | ||
13 | require conf/machine/include/tune-xscale.inc | 12 | require conf/machine/include/tune-xscale.inc |
13 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | ||
14 | 14 | ||
15 | # Console serial port. | 15 | # Console serial port. |
16 | # If you have a W module, add the following line to your local.conf: | 16 | # 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 333af4f2f2..f72ab2939e 100644 --- a/meta/conf/machine/depicture.conf +++ b/meta/conf/machine/depicture.conf | |||
@@ -3,7 +3,6 @@ | |||
3 | #@DESCRIPTION: Machine configuration for running an ARM 920t in the BBD20EUROU board. | 3 | #@DESCRIPTION: Machine configuration for running an ARM 920t in the BBD20EUROU board. |
4 | 4 | ||
5 | TARGET_ARCH = "arm" | 5 | TARGET_ARCH = "arm" |
6 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t" | ||
7 | 6 | ||
8 | require conf/machine/include/qemu.inc | 7 | require conf/machine/include/qemu.inc |
9 | require conf/machine/include/tune-arm920t.inc | 8 | require conf/machine/include/tune-arm920t.inc |
diff --git a/meta/conf/machine/em-x270.conf b/meta/conf/machine/em-x270.conf index 47fb8ca533..9bcec5b742 100644 --- a/meta/conf/machine/em-x270.conf +++ b/meta/conf/machine/em-x270.conf | |||
@@ -8,7 +8,6 @@ | |||
8 | TARGET_ARCH = "arm" | 8 | TARGET_ARCH = "arm" |
9 | GUI_MACHINE_CLASS ?= "bigscreen" | 9 | GUI_MACHINE_CLASS ?= "bigscreen" |
10 | 10 | ||
11 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " | ||
12 | PREFERRED_PROVIDER_virtual/kernel = "linux" | 11 | PREFERRED_PROVIDER_virtual/kernel = "linux" |
13 | 12 | ||
14 | require conf/machine/include/tune-xscale.inc | 13 | require conf/machine/include/tune-xscale.inc |
diff --git a/meta/conf/machine/htcuniversal.conf b/meta/conf/machine/htcuniversal.conf index 2f5b798bff..72f3bc4aad 100644 --- a/meta/conf/machine/htcuniversal.conf +++ b/meta/conf/machine/htcuniversal.conf | |||
@@ -4,9 +4,9 @@ | |||
4 | 4 | ||
5 | #include conf/machine/include/tune-iwmmxt.inc | 5 | #include conf/machine/include/tune-iwmmxt.inc |
6 | include conf/machine/include/tune-xscale.inc | 6 | include conf/machine/include/tune-xscale.inc |
7 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | ||
7 | 8 | ||
8 | TARGET_ARCH = "arm" | 9 | TARGET_ARCH = "arm" |
9 | PACKAGE_EXTRA_ARCHS = "armv4t armv5te iwmmxt" | ||
10 | 10 | ||
11 | PREFERRED_PROVIDER_virtual/kernel = "linux-rp" | 11 | PREFERRED_PROVIDER_virtual/kernel = "linux-rp" |
12 | 12 | ||
diff --git a/meta/conf/machine/hx2000.conf b/meta/conf/machine/hx2000.conf index 8b4c39f805..a6775f2c3a 100644 --- a/meta/conf/machine/hx2000.conf +++ b/meta/conf/machine/hx2000.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | #@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU | 3 | #@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU |
4 | 4 | ||
5 | TARGET_ARCH = "arm" | 5 | TARGET_ARCH = "arm" |
6 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " | 6 | PACKAGE_EXTRA_ARCHS += "iwmmxt" |
7 | 7 | ||
8 | PREFERRED_PROVIDER_virtual/kernel = "linux-rp" | 8 | PREFERRED_PROVIDER_virtual/kernel = "linux-rp" |
9 | 9 | ||
diff --git a/meta/conf/machine/igep0020.conf b/meta/conf/machine/igep0020.conf index 9ddbad65b3..86adfcf1a0 100644 --- a/meta/conf/machine/igep0020.conf +++ b/meta/conf/machine/igep0020.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: IGEP v2 machine | 2 | #@NAME: IGEP v2 machine |
3 | #@DESCRIPTION: Machine configuration for the IGEP v2 board (http://www.myigep.com) | 3 | #@DESCRIPTION: Machine configuration for the IGEP v2 board (http://www.myigep.com) |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a" | ||
6 | 5 | ||
7 | # Floating point option | 6 | # Floating point option |
8 | TARGET_FPU_arm = "hard" | 7 | TARGET_FPU_arm = "hard" |
diff --git a/meta/conf/machine/igep0030.conf b/meta/conf/machine/igep0030.conf index 7ebfaa0ca5..af36982a6a 100644 --- a/meta/conf/machine/igep0030.conf +++ b/meta/conf/machine/igep0030.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: OMAP3 IGEP module | 2 | #@NAME: OMAP3 IGEP module |
3 | #@DESCRIPTION: Machine configuration for the OMAP3 IGEP module (http://www.myigep.com) | 3 | #@DESCRIPTION: Machine configuration for the OMAP3 IGEP module (http://www.myigep.com) |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a" | ||
6 | 5 | ||
7 | # Floating point option | 6 | # Floating point option |
8 | TARGET_FPU_arm = "hard" | 7 | 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 be5aedc509..a7717510e6 100644 --- 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" | |||
4 | BASE_PACKAGE_ARCH = "armv6" | 4 | BASE_PACKAGE_ARCH = "armv6" |
5 | 5 | ||
6 | ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" | 6 | ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" |
7 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6" | ||
7 | 8 | ||
8 | require conf/machine/include/tune-thumb.inc | 9 | 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 1f7a04bb3b..fee5c586c9 100644 --- a/meta/conf/machine/include/tune-arm920t.inc +++ b/meta/conf/machine/include/tune-arm920t.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | FEED_ARCH = "armv4t" | 1 | FEED_ARCH = "armv4t" |
2 | BASE_PACKAGE_ARCH = "armv4t" | 2 | BASE_PACKAGE_ARCH = "armv4t" |
3 | TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" | 3 | TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" |
4 | 4 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t" | |
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc index e80ef10490..f41e460999 100644 --- a/meta/conf/machine/include/tune-arm926ejs.inc +++ b/meta/conf/machine/include/tune-arm926ejs.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | FEED_ARCH = "armv5te" | 1 | FEED_ARCH = "armv5te" |
2 | 2 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te" | |
3 | # For gcc 3.x you need: | 3 | # For gcc 3.x you need: |
4 | #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" | 4 | #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" |
5 | # For gcc 4.x you need: | 5 | # 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 39e4493014..d788b5304f 100644 --- a/meta/conf/machine/include/tune-arm9tdmi.inc +++ b/meta/conf/machine/include/tune-arm9tdmi.inc | |||
@@ -1,2 +1,4 @@ | |||
1 | FEED_ARCH = "armv4t" | ||
1 | BASE_PACKAGE_ARCH = "armv4t" | 2 | BASE_PACKAGE_ARCH = "armv4t" |
3 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t" | ||
2 | TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" | 4 | 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 96c8c64904..379a3eb011 100644 --- a/meta/conf/machine/include/tune-armv7.inc +++ b/meta/conf/machine/include/tune-armv7.inc | |||
@@ -3,4 +3,5 @@ | |||
3 | # This will NOT compile programs in 'ARM' mode, which is what you really want | 3 | # This will NOT compile programs in 'ARM' mode, which is what you really want |
4 | TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" | 4 | TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" |
5 | FEED_ARCH = "armv7" | 5 | FEED_ARCH = "armv7" |
6 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7" | ||
6 | BASE_PACKAGE_ARCH = "armv7" | 7 | BASE_PACKAGE_ARCH = "armv7" |
diff --git a/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/tune-atom.inc index 0f09e8d56f..a401856c8b 100644 --- a/meta/conf/machine/include/tune-atom.inc +++ b/meta/conf/machine/include/tune-atom.inc | |||
@@ -2,3 +2,4 @@ BASE_PACKAGE_ARCH = "core2" | |||
2 | TARGET_CC_ARCH = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse" | 2 | TARGET_CC_ARCH = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse" |
3 | #MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables" | 3 | #MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables" |
4 | 4 | ||
5 | 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 107341eb62..1d636e89c6 100644 --- a/meta/conf/machine/include/tune-c3.inc +++ b/meta/conf/machine/include/tune-c3.inc | |||
@@ -1,3 +1,4 @@ | |||
1 | TARGET_CC_ARCH = "-march=c3 -mtune=c3" | 1 | TARGET_CC_ARCH = "-march=c3 -mtune=c3" |
2 | PACKAGE_EXTRA_ARCHS += "i386 i486 i586" | ||
2 | BASE_PACKAGE_ARCH = "i586" | 3 | BASE_PACKAGE_ARCH = "i586" |
3 | 4 | FEED_ARCH = "i586" | |
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc index 2c40b70560..3ec1c03500 100644 --- 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 | |||
10 | 10 | ||
11 | FEED_ARCH = "armv7a" | 11 | FEED_ARCH = "armv7a" |
12 | BASE_PACKAGE_ARCH = "armv7a" | 12 | BASE_PACKAGE_ARCH = "armv7a" |
13 | 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 2cfdf5270f..d0c5bb2e98 100644 --- 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" | |||
2 | # add "-mfp=maverick" for newer gcc versions > 4.0 | 2 | # add "-mfp=maverick" for newer gcc versions > 4.0 |
3 | 3 | ||
4 | #set arch to ep9312 for all generated packages | 4 | #set arch to ep9312 for all generated packages |
5 | PACKAGE_EXTRA_ARCHS += "armv4t ep9312" | ||
5 | BASE_PACKAGE_ARCH = "ep9312" | 6 | BASE_PACKAGE_ARCH = "ep9312" |
7 | FEED_ARCH = "ep9312" | ||
6 | 8 | ||
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc index 49e560ea1a..f7291be805 100644 --- a/meta/conf/machine/include/tune-iwmmxt.inc +++ b/meta/conf/machine/include/tune-iwmmxt.inc | |||
@@ -2,5 +2,6 @@ | |||
2 | # Please use tune-xscale for PXA255/PXA26x based processors. | 2 | # Please use tune-xscale for PXA255/PXA26x based processors. |
3 | TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" | 3 | TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" |
4 | BASE_PACKAGE_ARCH = "iwmmxt" | 4 | BASE_PACKAGE_ARCH = "iwmmxt" |
5 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | 5 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te iwmmxt" |
6 | FEED_ARCH = "iwmmxt" | ||
6 | 7 | ||
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc index 93da66b158..67edca2530 100644 --- a/meta/conf/machine/include/tune-mips32.inc +++ b/meta/conf/machine/include/tune-mips32.inc | |||
@@ -1 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-march=mips32" | 1 | TARGET_CC_ARCH = "-march=mips32" |
2 | FEED_ARCH = "${TARGET_ARCH}" | ||
3 | BASE_PACKAGE_ARCH = "${TARGET_ARCH}" | ||
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc index a4a68d60e3..15a72d10a1 100644 --- a/meta/conf/machine/include/tune-ppc603e.inc +++ b/meta/conf/machine/include/tune-ppc603e.inc | |||
@@ -1,2 +1,4 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=603e -mhard-float" | 1 | TARGET_CC_ARCH = "-mcpu=603e -mhard-float" |
2 | BASE_PACKAGE_ARCH = "ppc603e" | 2 | BASE_PACKAGE_ARCH = "ppc603e" |
3 | FEED_ARCH = "ppc603e" | ||
4 | PACKAGE_EXTRA_ARCHS += "ppc603e" | ||
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc index 067a7b100c..2956875186 100644 --- a/meta/conf/machine/include/tune-ppce300c2.inc +++ b/meta/conf/machine/include/tune-ppce300c2.inc | |||
@@ -1,2 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float" | 1 | TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float" |
2 | BASE_PACKAGE_ARCH = "ppce300" | 2 | BASE_PACKAGE_ARCH = "ppce300" |
3 | PACKAGE_EXTRA_ARCHS += "ppce300" | ||
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc index 2482196424..44f8742f9f 100644 --- a/meta/conf/machine/include/tune-ppce500.inc +++ b/meta/conf/machine/include/tune-ppce500.inc | |||
@@ -1,2 +1,4 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=8540" | 1 | TARGET_CC_ARCH = "-mcpu=8540" |
2 | BASE_PACKAGE_ARCH = "ppce500" | 2 | BASE_PACKAGE_ARCH = "ppce500" |
3 | FEED_ARCH = "ppce500" | ||
4 | PACKAGE_EXTRA_ARCHS += "ppce500" | ||
diff --git a/meta/conf/machine/include/tune-sh3.inc b/meta/conf/machine/include/tune-sh3.inc index 192dd8fd22..32801a61c3 100644 --- a/meta/conf/machine/include/tune-sh3.inc +++ b/meta/conf/machine/include/tune-sh3.inc | |||
@@ -1 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-ml -m3" | 1 | TARGET_CC_ARCH = "-ml -m3" |
2 | FEED_ARCH = "sh3" | ||
3 | BASE_PACKAGE_ARCH = "sh3" | ||
diff --git a/meta/conf/machine/include/tune-sh4.inc b/meta/conf/machine/include/tune-sh4.inc index 866f7f89d5..51b40691bc 100644 --- a/meta/conf/machine/include/tune-sh4.inc +++ b/meta/conf/machine/include/tune-sh4.inc | |||
@@ -1 +1,7 @@ | |||
1 | # NOTE: If you want to optimize to sh4a, conf/machine/include/tune-sh4a.inc. | ||
2 | # But it is not compatible for sh4. | ||
3 | # The binary optimized by m4a doesn't operate on sh4. It works on sh4a only. | ||
4 | |||
1 | TARGET_CC_ARCH = "-ml -m4" | 5 | TARGET_CC_ARCH = "-ml -m4" |
6 | FEED_ARCH = "sh4" | ||
7 | BASE_PACKAGE_ARCH = "sh4" | ||
diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc index 10133c6c21..a402e7cd2b 100644 --- a/meta/conf/machine/include/tune-supersparc.inc +++ b/meta/conf/machine/include/tune-supersparc.inc | |||
@@ -1,2 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=supersparc" | 1 | TARGET_CC_ARCH = "-mcpu=supersparc" |
2 | BASE_PACKAGE_ARCH = "supersparc" | 2 | BASE_PACKAGE_ARCH = "supersparc" |
3 | FEED_ARCH = "supersparc" | ||
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 4f96814a72..f1ef3d46af 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc | |||
@@ -5,6 +5,7 @@ INHERIT += "siteinfo" | |||
5 | TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" | 5 | TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" |
6 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" | 6 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" |
7 | BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" | 7 | BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" |
8 | PACKAGE_EXTRA_ARCHS += "${@['armv4b armv4tb armv5teb', 'armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" | ||
8 | 9 | ||
9 | # webkit-gtk has alignment issues with double instructions on armv5 so | 10 | # webkit-gtk has alignment issues with double instructions on armv5 so |
10 | # disable them here | 11 | # disable them here |
diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta/conf/machine/mpc8315e-rdb.conf index 1b7982a5dd..919a95d9ef 100644 --- a/meta/conf/machine/mpc8315e-rdb.conf +++ b/meta/conf/machine/mpc8315e-rdb.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@DESCRIPTION: Machine configuration for running | 2 | #@DESCRIPTION: Machine configuration for running |
3 | 3 | ||
4 | TARGET_ARCH = "powerpc" | 4 | TARGET_ARCH = "powerpc" |
5 | PACKAGE_EXTRA_ARCHS = "ppc603e" | ||
6 | TARGET_FPU = "spe" | 5 | TARGET_FPU = "spe" |
7 | 6 | ||
8 | require conf/machine/include/tune-ppc603e.inc | 7 | require conf/machine/include/tune-ppc603e.inc |
diff --git a/meta/conf/machine/mx31ads.conf b/meta/conf/machine/mx31ads.conf index 04a238d600..8b3e3dbc1a 100644 --- a/meta/conf/machine/mx31ads.conf +++ b/meta/conf/machine/mx31ads.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: Freescale imx31 ADS Board | 2 | #@NAME: Freescale imx31 ADS Board |
3 | #@DESCRIPTION: Machine configuration for the imx31 based Freescale ADS Board | 3 | #@DESCRIPTION: Machine configuration for the imx31 based Freescale ADS Board |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" | ||
6 | 5 | ||
7 | PREFERRED_PROVIDER_virtual/kernel = "linux-mx31" | 6 | PREFERRED_PROVIDER_virtual/kernel = "linux-mx31" |
8 | 7 | ||
diff --git a/meta/conf/machine/mx31phy.conf b/meta/conf/machine/mx31phy.conf index 28b255ccec..eea673ab16 100644 --- a/meta/conf/machine/mx31phy.conf +++ b/meta/conf/machine/mx31phy.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: Phytec phyCORE-iMX31 Board | 2 | #@NAME: Phytec phyCORE-iMX31 Board |
3 | #@DESCRIPTION: Machine configuration for the imx31 based Phytec phyCORE-iMX31 | 3 | #@DESCRIPTION: Machine configuration for the imx31 based Phytec phyCORE-iMX31 |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" | ||
6 | 5 | ||
7 | PREFERRED_PROVIDER_virtual/kernel = "linux-mx31" | 6 | PREFERRED_PROVIDER_virtual/kernel = "linux-mx31" |
8 | 7 | ||
diff --git a/meta/conf/machine/omap-3430ldp.conf b/meta/conf/machine/omap-3430ldp.conf index 0be0546b80..759d58f015 100644 --- a/meta/conf/machine/omap-3430ldp.conf +++ b/meta/conf/machine/omap-3430ldp.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: TI OMAP 3430 LDP | 2 | #@NAME: TI OMAP 3430 LDP |
3 | #@DESCRIPTION: Machine configuration for the TI OMAP 3430 LDP (aka OMAP Zoom) | 3 | #@DESCRIPTION: Machine configuration for the TI OMAP 3430 LDP (aka OMAP Zoom) |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7a" | ||
6 | 5 | ||
7 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" | 6 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" |
8 | 7 | ||
diff --git a/meta/conf/machine/omap-3430sdp.conf b/meta/conf/machine/omap-3430sdp.conf index 5d87bd1483..651d6a9968 100644 --- a/meta/conf/machine/omap-3430sdp.conf +++ b/meta/conf/machine/omap-3430sdp.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: TI OMAP 3430 SDP | 2 | #@NAME: TI OMAP 3430 SDP |
3 | #@DESCRIPTION: Machine configuration for the TI OMAP 3430 SDP | 3 | #@DESCRIPTION: Machine configuration for the TI OMAP 3430 SDP |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7a" | ||
6 | 5 | ||
7 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" | 6 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" |
8 | 7 | ||
diff --git a/meta/conf/machine/overo.conf b/meta/conf/machine/overo.conf index dde4bff476..9fefd73b48 100644 --- a/meta/conf/machine/overo.conf +++ b/meta/conf/machine/overo.conf | |||
@@ -5,7 +5,6 @@ | |||
5 | include conf/machine/include/tune-cortexa8.inc | 5 | include conf/machine/include/tune-cortexa8.inc |
6 | 6 | ||
7 | TARGET_ARCH = "arm" | 7 | TARGET_ARCH = "arm" |
8 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a" | ||
9 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" | 8 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" |
10 | 9 | ||
11 | PREFERRED_VERSION_u-boot = "git" | 10 | PREFERRED_VERSION_u-boot = "git" |
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 400ecc8245..9fb18932ca 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
@@ -3,7 +3,6 @@ | |||
3 | #@DESCRIPTION: arm_versaile_926ejs | 3 | #@DESCRIPTION: arm_versaile_926ejs |
4 | 4 | ||
5 | TARGET_ARCH = "arm" | 5 | TARGET_ARCH = "arm" |
6 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" | ||
7 | 6 | ||
8 | require conf/machine/include/qemu.inc | 7 | require conf/machine/include/qemu.inc |
9 | require conf/machine/include/tune-arm926ejs.inc | 8 | require conf/machine/include/tune-arm926ejs.inc |
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index 0bbeac7da6..83d0841159 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf | |||
@@ -3,7 +3,6 @@ | |||
3 | #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation | 3 | #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation |
4 | 4 | ||
5 | TARGET_ARCH = "powerpc" | 5 | TARGET_ARCH = "powerpc" |
6 | PACKAGE_EXTRA_ARCHS = "ppc603e" | ||
7 | 6 | ||
8 | require conf/machine/include/qemu.inc | 7 | require conf/machine/include/qemu.inc |
9 | require conf/machine/include/tune-ppc603e.inc | 8 | require conf/machine/include/tune-ppc603e.inc |
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index fd34709b78..182759adfe 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -4,7 +4,6 @@ | |||
4 | 4 | ||
5 | TARGET_ARCH = "x86_64" | 5 | TARGET_ARCH = "x86_64" |
6 | TRANSLATED_TARGET_ARCH = "x86-64" | 6 | TRANSLATED_TARGET_ARCH = "x86-64" |
7 | PACKAGE_EXTRA_ARCHS = "x86" | ||
8 | 7 | ||
9 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" | 8 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" |
10 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | 9 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index cb2a32d7bd..f1a0939ebc 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -3,7 +3,6 @@ | |||
3 | #@DESCRIPTION: Machine configuration for running a common x86 | 3 | #@DESCRIPTION: Machine configuration for running a common x86 |
4 | 4 | ||
5 | TARGET_ARCH = "i586" | 5 | TARGET_ARCH = "i586" |
6 | PACKAGE_EXTRA_ARCHS = "x86" | ||
7 | 6 | ||
8 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" | 7 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" |
9 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | 8 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" |
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf index 4a794331e8..faa00e991f 100644 --- a/meta/conf/machine/spitz.conf +++ b/meta/conf/machine/spitz.conf | |||
@@ -9,7 +9,6 @@ MACHINE_FEATURES += "iwmmxt" | |||
9 | 9 | ||
10 | PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" | 10 | PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" |
11 | 11 | ||
12 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | ||
13 | IMAGE_FSTYPES ?= "tar.gz ext3" | 12 | IMAGE_FSTYPES ?= "tar.gz ext3" |
14 | IMAGE_ROOTFS_SIZE_ext3 = "250000" | 13 | IMAGE_ROOTFS_SIZE_ext3 = "250000" |
15 | 14 | ||
diff --git a/meta/conf/machine/zoom2.conf b/meta/conf/machine/zoom2.conf index 142a40c5a1..dec90c2c7b 100644 --- a/meta/conf/machine/zoom2.conf +++ b/meta/conf/machine/zoom2.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: Logic PD Zoom2 | 2 | #@NAME: Logic PD Zoom2 |
3 | #@DESCRIPTION: Machine configuration for the OMAP3-powered Logic PD Zoom2 | 3 | #@DESCRIPTION: Machine configuration for the OMAP3-powered Logic PD Zoom2 |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7a" | ||
6 | 5 | ||
7 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap-zoomsync" | 6 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap-zoomsync" |
8 | 7 | ||
diff --git a/meta/conf/machine/zylonite.conf b/meta/conf/machine/zylonite.conf index 644675e849..e82f041ff2 100644 --- a/meta/conf/machine/zylonite.conf +++ b/meta/conf/machine/zylonite.conf | |||
@@ -4,8 +4,9 @@ | |||
4 | 4 | ||
5 | require conf/machine/include/tune-xscale.inc | 5 | require conf/machine/include/tune-xscale.inc |
6 | 6 | ||
7 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | ||
8 | |||
7 | TARGET_ARCH = "arm" | 9 | TARGET_ARCH = "arm" |
8 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt" | ||
9 | 10 | ||
10 | EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n -x lzo -p" | 11 | EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n -x lzo -p" |
11 | 12 | ||