diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2013-07-25 07:44:00 +0530 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2014-02-15 13:36:01 +0100 |
| commit | 479148e18389b467bb6ed59ba641f44ebdd38440 (patch) | |
| tree | db41e4a3f0a14d4b3067d9be32a53530d5a5440f | |
| parent | d9567ee90dcaa78613cdbea1315f9913771a3687 (diff) | |
| download | build-479148e18389b467bb6ed59ba641f44ebdd38440.tar.gz | |
build/core: Fix build errors
- Include task hooks only if they exists
- Fix typos
Signed-off-by: Amit Pundir <amit.pundir@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 399043809e..285ef74ce9 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -24,9 +24,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 03b6a7483e..686969a66d 100644 --- a/core/combo/arch/arm/armv7-a.mk +++ b/core/combo/arch/arm/armv7-a.mk @@ -12,9 +12,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 6b2e62696c..cbe1628617 100644 --- a/core/config.mk +++ b/core/config.mk @@ -425,7 +425,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 5f2df5325b..6f3f09a715 100644 --- a/core/legacy_prebuilts.mk +++ b/core/legacy_prebuilts.mk @@ -89,8 +89,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 |