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

2021-05-24 Thread Tom Rini
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 
> Reviewed-by: Bin Meng 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature


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

2021-05-24 Thread Tom Rini
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 
> Reviewed-by: Bin Meng 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature


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

2021-05-20 Thread Marek Behún
Indent the linking commands so that they look cosmetically better.

Signed-off-by: Marek Behún 
Reviewed-by: Bin Meng 
---
 Makefile | 12 +++-
 scripts/Makefile.spl | 17 +++--
 2 files changed, 18 insertions(+), 11 deletions(-)

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