diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-14 14:29:59 +0159 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-02-04 14:45:37 +0100 |
| commit | 9e2cae413ec8b0eb15b9e9157f1d8778b44a0e0c (patch) | |
| tree | 5a9631ca942493154b1202bee874f66707cdcd50 | |
| parent | 78d1695f495b95b9314073e8c5aa1dd92dc3fcf7 (diff) | |
| download | build-9e2cae413ec8b0eb15b9e9157f1d8778b44a0e0c.tar.gz | |
build/core: Fix build errors
- Include task hooks only if they exists
- Fix typos
Change-Id: Ide3b1bd0bac050da5b96d1e9a0dabd55fbf675fe
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | core/combo/arch/arm/armv7-a-neon.mk | 3 | ||||
| -rw-r--r-- | core/combo/arch/arm/armv7-a.mk | 3 | ||||
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | core/legacy_prebuilts.mk | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index 5b97dfa1d4..2f03164ca7 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -21,9 +21,10 @@ arch_variant_cflags := \ -mfloat-abi=softfp \ -mfpu=neon -arch_variant_ldflags := \ ifneq (,$(findstring cpu=cortex-a9,$(TARGET_EXTRA_CFLAGS))) +arch_variant_ldflags := \ -Wl,--no-fix-cortex-a8 else +arch_variant_ldflags := \ -Wl,--fix-cortex-a8 endif diff --git a/core/combo/arch/arm/armv7-a.mk b/core/combo/arch/arm/armv7-a.mk index 9bf5900000..b631ded6f1 100644 --- a/core/combo/arch/arm/armv7-a.mk +++ b/core/combo/arch/arm/armv7-a.mk @@ -19,9 +19,10 @@ arch_variant_cflags := \ -mfloat-abi=softfp \ -mfpu=vfpv3-d16 -arch_variant_ldflags := \ ifneq (,$(findstring cpu=cortex-a9,$(TARGET_EXTRA_CFLAGS))) +arch_variant_ldflags := \ -Wl,--no-fix-cortex-a8 else +arch_variant_ldflags := \ -Wl,--fix-cortex-a8 endif diff --git a/core/config.mk b/core/config.mk index 4cab27bb22..006b5ef172 100644 --- a/core/config.mk +++ b/core/config.mk @@ -402,7 +402,7 @@ TARGET_PROJECT_INCLUDES:= $(SRC_HEADERS) $(TARGET_OUT_HEADERS) \ TARGET_GLOBAL_CFLAGS += $(TARGET_ERROR_FLAGS) TARGET_GLOBAL_CPPFLAGS += $(TARGET_ERROR_FLAGS) -ifeq($(TARGET_EXTRA_CPPFLAGS),) +ifeq ($(TARGET_EXTRA_CPPFLAGS),) TARGET_EXTRA_CPPFLAGS := $(TARGET_EXTRA_CFLAGS) endif diff --git a/core/legacy_prebuilts.mk b/core/legacy_prebuilts.mk index cb74f8e248..e527e55a2b 100644 --- a/core/legacy_prebuilts.mk +++ b/core/legacy_prebuilts.mk @@ -101,8 +101,10 @@ GRANDFATHERED_ALL_PREBUILT := \ wl1271.bin \ zoneinfo.dat \ zoneinfo.idx \ - zoneinfo.version \ -ifeq($(TARGET_BOOTLOADER_TYPE),uboot) + zoneinfo.version + +ifeq ($(TARGET_BOOTLOADER_TYPE),uboot) +GRANDFATHERED_ALL_PREBUILT += \ build-uboot \ build-mkenvimg endif |