diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/arm-thumb.inc | 6 | ||||
| -rw-r--r-- | conf/distro/micro.conf | 6 | ||||
| -rw-r--r-- | conf/distro/minimal.conf | 5 | ||||
| -rw-r--r-- | conf/distro/shr.conf | 5 |
4 files changed, 12 insertions, 10 deletions
diff --git a/conf/distro/include/arm-thumb.inc b/conf/distro/include/arm-thumb.inc index 36edd4f670..75ed9780a2 100644 --- a/conf/distro/include/arm-thumb.inc +++ b/conf/distro/include/arm-thumb.inc @@ -16,9 +16,9 @@ THUMB_INTERWORK ?= "no" # arm system and vice versa. It is strongly recommended that DISTROs not # turn this off - the actual cost is very small. -OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" -OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -OVERRIDES_append_arm =. "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" +OVERRIDE_THUMB = "${@['', 'thumb:'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" +OVERRIDE_INTERWORK = "${@['', 'thumb-interwork:'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" +OVERRIDES_prepend_arm =. "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" # Compiler and linker options for application code and kernel code. These # options ensure that the compiler has the correct settings for the selected diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index 6d396b3397..19b5e6209b 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -69,10 +69,10 @@ require conf/distro/include/sane-toolchain.inc require conf/distro/include/arm-thumb.inc ############################################################################# -# OVERRIDES adjusted from bitbake.conf to feature the MACHINE_CLASS +# Ensure MACHINE_CLASS is in OVERRIDES ############################################################################# -OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\ -${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +MACHINE_CLASS ?= "" +MACHINE_OVERRIDES += "${MACHINE_CLASS}" ############################################################################# # PREFERRED VERSIONS diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 376ffdee02..0d32cfeffe 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -81,9 +81,10 @@ KERNEL = "kernel26" MACHINE_KERNEL_VERSION = "2.6" ############################################################################# -# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS +# Ensure MACHINE_CLASS is in OVERRIDES ############################################################################# -OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +MACHINE_CLASS ?= "" +MACHINE_OVERRIDES += "${MACHINE_CLASS}" ############################################################################# # TOOLCHAIN diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index ade8cbad2a..74e3fe9c29 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -151,9 +151,10 @@ KERNEL = "kernel26" MACHINE_KERNEL_VERSION = "2.6" ############################################################################# -# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS +# Ensure MACHINE_CLASS is in OVERRIDES ############################################################################# -OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +MACHINE_CLASS ?= "" +MACHINE_OVERRIDES += "${MACHINE_CLASS}" ############################################################################# # TOOLCHAIN |