diff mbox series

[15/17] Makefile: Support ad-hoc COMFIX_SPL_IMAGE_SIZE et al

Message ID 20210917161741.1275871-16-sjg@chromium.org
State RFC
Delegated to: Tom Rini
Headers show
Series RFC: Split configs between U-Boot proper and SPL builds | expand

Commit Message

Simon Glass Sept. 17, 2021, 4:17 p.m. UTC
Ad-hoc CONFIGs are not supported by the new split-config mechanism. Use
the provided work-around for these symbols, just to show the mechanism.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 scripts/Makefile.spl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index a6705efcf07..8baf8478f64 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -198,11 +198,11 @@  LDPPFLAGS += \
 
 # Turn various CONFIG symbols into IMAGE symbols for easy reuse of
 # the scripts between SPL and TPL.
-ifneq ($(CONFIG_$(SPL_TPL_)MAX_SIZE),)
-LDPPFLAGS += -DIMAGE_MAX_SIZE=$(CONFIG_$(SPL_TPL_)MAX_SIZE)
+ifneq ($(CONFIG_$(xSPL_TPL_)MAX_SIZE),)
+LDPPFLAGS += -DIMAGE_MAX_SIZE=$(CONFIG_$(xSPL_TPL_)MAX_SIZE)
 endif
-ifneq ($(CONFIG_$(SPL_TPL_)TEXT_BASE),)
-LDPPFLAGS += -DIMAGE_TEXT_BASE=$(CONFIG_$(SPL_TPL_)TEXT_BASE)
+ifneq ($(CONFIG_$(xSPL_TPL_)TEXT_BASE),)
+LDPPFLAGS += -DIMAGE_TEXT_BASE=$(CONFIG_$(xSPL_TPL_)TEXT_BASE)
 endif
 
 MKIMAGEOUTPUT ?= /dev/null