Do not set -DCOMPRESSED_UBOOT=0
authorTobias Diedrich <ranma+coreboot@tdiedrich.de>
Mon, 19 Oct 2015 17:46:22 +0000 (19:46 +0200)
committerTobias Diedrich <ranma+coreboot@tdiedrich.de>
Mon, 19 Oct 2015 17:46:22 +0000 (19:46 +0200)
The code only checks for existance, so -DCOMPRESSED_UBOOT=0
leads to "#ifdef COMPRESSED_UBOOT" protected sections to be wrongly
included.

u-boot/config.mk

index 9ed60dc08259c7d0c6ed0863043c88c7e369af3b..69ffca4b796c874ace8f2f22ed84a71dcd4ab5f7 100644 (file)
@@ -136,10 +136,8 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes \
        -DBUILD_TAG='"$(BUILD_TAG)"'
 else
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes
-ifeq ($(COMPRESSED_UBOOT),1)
+ifdef COMPRESSED_UBOOT
 CFLAGS += -DCOMPRESSED_UBOOT=1
-else
-CFLAGS += -DCOMPRESSED_UBOOT=0
 endif
 
 ifeq ($(BUILD_OPTIMIZED),y)
@@ -174,15 +172,13 @@ endif
 AFLAGS_DEBUG := -Wa,-gstabs
 
 AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)
-ifeq ($(COMPRESSED_UBOOT),1)
+ifdef COMPRESSED_UBOOT
 AFLAGS += -DCOMPRESSED_UBOOT=1
-else
-AFLAGS += -DCOMPRESSED_UBOOT=0
 endif
 
 LDFLAGS += -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
 
-ifeq ($(COMPRESSED_UBOOT), 1)
+ifdef COMPRESSED_UBOOT
 LDFLAGS_BOOTSTRAP += -Bstatic -T $(LDSCRIPT_BOOTSTRAP) -Ttext $(BOOTSTRAP_TEXT_BASE) $(PLATFORM_LDFLAGS)
 endif