summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2021-05-20 13:24:01 +0200
committerTom Rini <trini@konsulko.com>2021-05-24 14:21:30 -0400
commit1445836ca70198471ee7b90ce691a6be2b9322d1 (patch)
tree56d05d9b38263082a8d6b9b82eca05ef6619c7a3
parent98e55f97afc2a212185804e2c1130bebe980db73 (diff)
downloadu-boot-1445836ca70198471ee7b90ce691a6be2b9322d1.tar.gz
u-boot-1445836ca70198471ee7b90ce691a6be2b9322d1.tar.xz
u-boot-1445836ca70198471ee7b90ce691a6be2b9322d1.zip
Makefile, Makefile.spl: cosmetic change
Indent the linking commands so that they look cosmetically better. Signed-off-by: Marek BehĂșn <marek.behun@nic.cz> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--Makefile12
-rw-r--r--scripts/Makefile.spl17
2 files changed, 18 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 9615f8b3a0..92d2a1ff6a 100644
--- a/Makefile
+++ b/Makefile
@@ -1711,11 +1711,13 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(ARCH)/Makefile.postlink)
# Rule to link u-boot
# May be overridden by arch/$(ARCH)/config.mk
quiet_cmd_u-boot__ ?= LD $@
- cmd_u-boot__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_u-boot) -o $@ \
- -T u-boot.lds $(u-boot-init) \
- --start-group $(u-boot-main) --end-group \
- $(PLATFORM_LIBS) -Map u-boot.map; \
- $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
+ cmd_u-boot__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_u-boot) -o $@ \
+ -T u-boot.lds $(u-boot-init) \
+ --start-group \
+ $(u-boot-main) \
+ --end-group \
+ $(PLATFORM_LIBS) -Map u-boot.map; \
+ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
quiet_cmd_smap = GEN common/system_map.o
cmd_smap = \
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index c69525fa74..92775fef54 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -451,12 +451,17 @@ $(obj)/$(SPL_BIN).sym: $(obj)/$(SPL_BIN) FORCE
# Rule to link u-boot-spl
# May be overridden by arch/$(ARCH)/config.mk
quiet_cmd_u-boot-spl ?= LD $@
- cmd_u-boot-spl ?= (cd $(obj) && $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_$(@F)) \
- $(patsubst $(obj)/%,%,$(u-boot-spl-init)) --start-group \
- $(patsubst $(obj)/%,%,$(u-boot-spl-main)) \
- $(patsubst $(obj)/%,%,$(u-boot-spl-platdata)) \
- --end-group \
- $(PLATFORM_LIBS) -Map $(SPL_BIN).map -o $(SPL_BIN))
+ cmd_u-boot-spl ?= \
+ ( \
+ cd $(obj) && \
+ $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_$(@F)) \
+ $(patsubst $(obj)/%,%,$(u-boot-spl-init)) \
+ --start-group \
+ $(patsubst $(obj)/%,%,$(u-boot-spl-main)) \
+ $(patsubst $(obj)/%,%,$(u-boot-spl-platdata)) \
+ --end-group \
+ $(PLATFORM_LIBS) -Map $(SPL_BIN).map -o $(SPL_BIN) \
+ )
$(obj)/$(SPL_BIN): $(u-boot-spl-platdata) $(u-boot-spl-init) \
$(u-boot-spl-main) $(obj)/u-boot-spl.lds FORCE