diff options
Diffstat (limited to 'meta/conf/machine/include')
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv4.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv5.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv6.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv7a.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/ia32/arch-ia32.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc index fcd56d72d9..5940467ae5 100644 --- a/meta/conf/machine/include/arm/arch-armv4.inc +++ b/meta/conf/machine/include/arm/arch-armv4.inc | |||
@@ -9,7 +9,7 @@ FIX_V4BX_ARMV4 = "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", " | |||
9 | FIX_V4BX_ARMV5 = "${@bb.utils.contains("TUNE_FEATURES", "armv5", "", "${FIX_V4BX_ARMV4}", d)}" | 9 | FIX_V4BX_ARMV5 = "${@bb.utils.contains("TUNE_FEATURES", "armv5", "", "${FIX_V4BX_ARMV4}", d)}" |
10 | FIX_V4BX = "${@bb.utils.contains("TUNE_FEATURES", "thumb", "", "${FIX_V4BX_ARMV5}", d)}" | 10 | FIX_V4BX = "${@bb.utils.contains("TUNE_FEATURES", "thumb", "", "${FIX_V4BX_ARMV5}", d)}" |
11 | TARGET_LD_KERNEL_ARCH += "${FIX_V4BX}" | 11 | TARGET_LD_KERNEL_ARCH += "${FIX_V4BX}" |
12 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}" | 12 | MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv4", "armv4:", "" ,d)}" |
13 | 13 | ||
14 | require conf/machine/include/arm/arch-arm.inc | 14 | require conf/machine/include/arm/arch-arm.inc |
15 | require conf/machine/include/arm/feature-arm-thumb.inc | 15 | require conf/machine/include/arm/feature-arm-thumb.inc |
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc index 5fdfa237ce..33fe401ee1 100644 --- a/meta/conf/machine/include/arm/arch-armv5.inc +++ b/meta/conf/machine/include/arm/arch-armv5.inc | |||
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5" | |||
3 | TUNEVALID[armv5] = "Enable instructions for ARMv5" | 3 | TUNEVALID[armv5] = "Enable instructions for ARMv5" |
4 | TUNECONFLICTS[armv5] = "armv4" | 4 | TUNECONFLICTS[armv5] = "armv4" |
5 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" | 5 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" |
6 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}" | 6 | MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv5", "armv5:", "" ,d)}" |
7 | 7 | ||
8 | ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}" | 8 | ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}" |
9 | 9 | ||
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc index ea6d73d0f7..882400ed0d 100644 --- a/meta/conf/machine/include/arm/arch-armv6.inc +++ b/meta/conf/machine/include/arm/arch-armv6.inc | |||
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6" | |||
3 | TUNEVALID[armv6] = "Enable instructions for ARMv6" | 3 | TUNEVALID[armv6] = "Enable instructions for ARMv6" |
4 | TUNECONFLICTS[armv6] = "armv4 armv5" | 4 | TUNECONFLICTS[armv6] = "armv4 armv5" |
5 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" | 5 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" |
6 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}" | 6 | MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv6", "armv6:", "" ,d)}" |
7 | 7 | ||
8 | require conf/machine/include/arm/arch-armv5-dsp.inc | 8 | require conf/machine/include/arm/arch-armv5-dsp.inc |
9 | 9 | ||
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc index a8ebd8219b..e876f33ddc 100644 --- a/meta/conf/machine/include/arm/arch-armv7a.inc +++ b/meta/conf/machine/include/arm/arch-armv7a.inc | |||
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a" | |||
3 | TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" | 3 | TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" |
4 | TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" | 4 | TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" |
5 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a", "", d)}" | 5 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a", "", d)}" |
6 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" | 6 | MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "armv7a:", "" ,d)}" |
7 | 7 | ||
8 | require conf/machine/include/arm/arch-armv6.inc | 8 | require conf/machine/include/arm/arch-armv6.inc |
9 | require conf/machine/include/arm/feature-arm-neon.inc | 9 | require conf/machine/include/arm/feature-arm-neon.inc |
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc index 15f67d7c62..a817bfd967 100644 --- a/meta/conf/machine/include/ia32/arch-ia32.inc +++ b/meta/conf/machine/include/ia32/arch-ia32.inc | |||
@@ -14,7 +14,7 @@ TUNEVALID[m32] = "IA32 ELF32 standard ABI" | |||
14 | TUNECONFLICTS[m32] = "m64 mx32" | 14 | TUNECONFLICTS[m32] = "m64 mx32" |
15 | TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}" | 15 | TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}" |
16 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" | 16 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" |
17 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "m32", ":x86", "" ,d)}" | 17 | MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86:", "" ,d)}" |
18 | 18 | ||
19 | # x32 ABI | 19 | # x32 ABI |
20 | TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI" | 20 | TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI" |
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 29caec9559..637f4efe51 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
@@ -12,7 +12,7 @@ XSERVER ?= "xserver-xorg \ | |||
12 | 12 | ||
13 | MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" | 13 | MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" |
14 | 14 | ||
15 | MACHINEOVERRIDES .= ":qemuall" | 15 | MACHINEOVERRIDES =. "qemuall:" |
16 | 16 | ||
17 | IMAGE_FSTYPES += "tar.bz2 ext3" | 17 | IMAGE_FSTYPES += "tar.bz2 ext3" |
18 | 18 | ||