diff mbox series

[u-boot,v4,12/36] Makefile, Makefile.spl: cosmetic change

Message ID 20210520112425.25166-13-marek.behun@nic.cz
State Accepted
Commit 1445836ca70198471ee7b90ce691a6be2b9322d1
Delegated to: Tom Rini
Headers show
Series U-Boot LTO (Sandbox + Some ARM boards) | expand

Commit Message

Marek Behún May 20, 2021, 11:24 a.m. UTC 
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>
---
 Makefile             | 12 +++++++-----
 scripts/Makefile.spl | 17 +++++++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

Comments

Tom Rini May 25, 2021, 12:55 a.m. UTC | #1 
On Thu, May 20, 2021 at 01:24:01PM +0200, Marek Behún wrote:

> 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>

Applied to u-boot/master, thanks!
Tom Rini May 25, 2021, 12:55 a.m. UTC | #2 
On Thu, May 20, 2021 at 01:24:01PM +0200, Marek Behún wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 3a6cd15460..bfdb65e098 100644
--- a/Makefile
+++ b/Makefile
@@ -1709,11 +1709,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