From: Tobias Diedrich <ranma+coreboot@tdiedrich.de>
Date: Mon, 19 Oct 2015 17:46:22 +0000 (+0200)
Subject: Do not set -DCOMPRESSED_UBOOT=0
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a2d772ed1a3a7cdbb9ca0c3470af6d4ccf601698;p=oweals%2Fu-boot_mod.git

Do not set -DCOMPRESSED_UBOOT=0

The code only checks for existance, so -DCOMPRESSED_UBOOT=0
leads to "#ifdef COMPRESSED_UBOOT" protected sections to be wrongly
included.
---

diff --git a/u-boot/config.mk b/u-boot/config.mk
index 9ed60dc..69ffca4 100644
--- a/u-boot/config.mk
+++ b/u-boot/config.mk
@@ -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