[u-boot,v2,15/38] Makefile, Makefile.spl: cosmetic change

Message ID	20210312103429.25895-16-marek.behun@nic.cz
State	Superseded
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz> To: u-boot@lists.denx.de, Simon Glass <sjg@chromium.org>, Heiko Schocher <hs@denx.de>, Patrick Delaunay <patrick.delaunay@st.com>, Patrice CHOTARD <patrice.chotard@foss.st.com>, Miquel Raynal <miquel.raynal@bootlin.com>, Tom Rini <trini@konsulko.com>, =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>, Stefan Roese <sr@denx.de>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Alexander Graf <agraf@csgraf.de>, Marek Vasut <marex@denx.de>, Neil Armstrong <narmstrong@baylibre.com>, Ryder Lee <ryder.lee@mediatek.com>, Adam Ford <aford173@gmail.com>, Bin Meng <bmeng.cn@gmail.com> Cc: =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz> Subject: [PATCH u-boot v2 15/38] Makefile, Makefile.spl: cosmetic change Date: Fri, 12 Mar 2021 11:34:06 +0100 Message-Id: <20210312103429.25895-16-marek.behun@nic.cz> In-Reply-To: <20210312103429.25895-1-marek.behun@nic.cz> References: <20210312103429.25895-1-marek.behun@nic.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	U-Boot LTO (Sandbox + Some ARM boards) \| expand [u-boot,v2,00/38] U-Boot LTO (Sandbox + Some ARM boards) [u-boot,v2,01/38] regmap: fix a serious pointer casting bug [u-boot,v2,02/38] api: fix a potential serious bug caused by undef CONFIG_SYS_64BIT_LBA [u-boot,v2,03/38] checkpatch: require quotes around section name in the __section() macro [u-boot,v2,04/38] treewide: Convert macro and uses of __section(foo) to __section("foo") [u-boot,v2,05/38] compiler.h: align the __ADDRESSABLE macro with Linux' version [u-boot,v2,06/38] linker_lists: prepare macros to avoid code repetition [u-boot,v2,07/38] test/py: improve regular expression for ut subtest symbol matcher [u-boot,v2,08/38] linker_lists: declare lists and entries as __ADDRESSABLE for LTO [u-boot,v2,09/38] string: make memcpy(), memset(), memcmp() and memmove() visible for LTO [u-boot,v2,10/38] efi_loader: fix warning when linking with LTO [u-boot,v2,11/38] efi_loader: add Sphinx doc for __efi_runtime and __efi_runtime_data [u-boot,v2,12/38] efi_loader: add macro for const EFI runtime data [u-boot,v2,13/38] efi_selftest: compiler flags for efi_selftest_miniapp_exception.o [u-boot,v2,14/38] lib: crc32: put the crc_table variable into efi_runtime_rodata section [u-boot,v2,15/38] Makefile, Makefile.spl: cosmetic change [u-boot,v2,16/38] build: use thin archives instead of incremental linking [u-boot,v2,17/38] build: support building with Link Time Optimizations [u-boot,v2,18/38] sandbox: errno: avoid conflict with libc's errno [u-boot,v2,19/38] sandbox: use sections instead of symbols for getopt array boundaries [u-boot,v2,20/38] sandbox: make LTO available [u-boot,v2,21/38] sandbox: enable LTO by default [u-boot,v2,22/38] ARM: global_data: make set_gd() work for armv5 and armv6 [u-boot,v2,23/38] ARM: make gd a function call for LTO and set via set_gd() [u-boot,v2,24/38] ARM: fix LTO build for some thumb-interwork cases [u-boot,v2,25/38] ARM: fix LTO for imx28_xea [u-boot,v2,26/38] ARM: fix LTO for apf27 [u-boot,v2,27/38] ARM: fix LTO for keystone [u-boot,v2,28/38] ARM: kona: fix clk_bsc_enable() type mismatch for LTO [u-boot,v2,29/38] ARM: imx8m: fix imx_eqos_txclk_set_rate() type mismatch for LTO [u-boot,v2,30/38] ARM: fix LTO for seaboard [u-boot,v2,31/38] ARM: fix LTO for rockchip and samsung [u-boot,v2,32/38] ARM: omap3: fix LTO for DM3730 (and possibly other omap3 boards) [u-boot,v2,33/38] armv8: SPL: discard relocation information [u-boot,v2,34/38] ata: ahci: fix ahci_link_up() type mismatch for LTO [u-boot,v2,35/38] ARM: make LTO available [u-boot,v2,36/38] ARM: don't use -ffunction-sections/-fdata-sections with LTO build [u-boot,v2,37/38] ARM: don't use --gc-sections with LTO when using private libgcc [u-boot,v2,38/38] ARM: enable LTO for some boards

Message ID

20210312103429.25895-16-marek.behun@nic.cz

State

Superseded

Delegated to:

Tom Rini

Headers

From: =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz>
To: u-boot@lists.denx.de, Simon Glass <sjg@chromium.org>,
 Heiko Schocher <hs@denx.de>, Patrick Delaunay <patrick.delaunay@st.com>,
 Patrice CHOTARD <patrice.chotard@foss.st.com>,
 Miquel Raynal <miquel.raynal@bootlin.com>, Tom Rini <trini@konsulko.com>,
	=?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>, Stefan Roese <sr@denx.de>,
 Heinrich Schuchardt <xypron.glpk@gmx.de>, Alexander Graf <agraf@csgraf.de>,
 Marek Vasut <marex@denx.de>, Neil Armstrong <narmstrong@baylibre.com>,
 Ryder Lee <ryder.lee@mediatek.com>, Adam Ford <aford173@gmail.com>,
 Bin Meng <bmeng.cn@gmail.com>
Cc: =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz>
Subject: [PATCH u-boot v2 15/38] Makefile, Makefile.spl: cosmetic change
Date: Fri, 12 Mar 2021 11:34:06 +0100
Message-Id: <20210312103429.25895-16-marek.behun@nic.cz>
In-Reply-To: <20210312103429.25895-1-marek.behun@nic.cz>
References: <20210312103429.25895-1-marek.behun@nic.cz>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

U-Boot LTO (Sandbox + Some ARM boards) | expand

Commit Message

Marek Behún March 12, 2021, 10:34 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(-)

diff --git a/Makefile b/Makefile
index d6eda45385..2012c4ef47 100644
--- a/Makefile
+++ b/Makefile
@@ -1747,11 +1747,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 1fd63efdfd..297f98dafd 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -427,12 +427,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

[u-boot,v2,15/38] Makefile, Makefile.spl: cosmetic change

Commit Message

Patch