diff options
-rw-r--r-- | meta/conf/bitbake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 782a9c2a31..e614057cb8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -539,6 +539,9 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL | |||
539 | # Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains. | 539 | # Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains. |
540 | #OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}" | 540 | #OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}" |
541 | 541 | ||
542 | CPU_FEATURES ?= "" | ||
543 | CPU_FEATURES_arm ?= "vfp" | ||
544 | |||
542 | ################################################################## | 545 | ################################################################## |
543 | # Include the rest of the config files. | 546 | # Include the rest of the config files. |
544 | ################################################################## | 547 | ################################################################## |
@@ -612,6 +615,3 @@ COMBINED_FEATURES = "\ | |||
612 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ | 615 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ |
613 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ | 616 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ |
614 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" | 617 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" |
615 | |||
616 | CPU_FEATURES ?= "" | ||
617 | CPU_FEATURES_arm ?= "vfp" | ||