From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bin Meng <bmeng.cn@gmail.com>
Date: Mon, 8 Mar 2021 17:11:33 +0800
Subject: [PATCH u-boot 15/39] Makefile, Makefile.spl: cosmetic change
In-Reply-To: <20210307042538.21229-16-marek.behun@nic.cz>
References: <20210307042538.21229-1-marek.behun@nic.cz>
 <20210307042538.21229-16-marek.behun@nic.cz>
Message-ID: <CAEUhbmXo+WmfoCLzyH4f_P4O3WSzaJcJ2biauD==skSb5iCmnQ@mail.gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Sun, Mar 7, 2021 at 12:26 PM Marek Beh?n <marek.behun@nic.cz> wrote:
>
> Indent the linking commands so that they look cosmetically better.
>
> Signed-off-by: Marek Beh?n <marek.behun@nic.cz>
> ---
>  Makefile             | 12 +++++++-----
>  scripts/Makefile.spl | 15 +++++++++------
>  2 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 68ce5195b2..7b0ba9df9a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1752,11 +1752,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 ea4e045769..3b5f5046c9 100644
> --- a/scripts/Makefile.spl
> +++ b/scripts/Makefile.spl
> @@ -420,12 +420,15 @@ $(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) && \

nits: should we put ( in a single line?

> +               $(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
> --

Regards,
Bin