[U-Boot] [PATCH 1/3] Kbuild: add LDFLAGS_STANDALONE

[Daniel Schwierzeck]

Am 23.09.18 um 19:15 schrieb Daniel Schwierzeck:
> Introduce a new Makefile variable for passing LDFLAGS to standalone
> programs. Currently the variable CONFIG_STANDALONE_LOAD_ADDR is
> misued on some archs to pass a specific linker script.

are there any objections or can I apply this to u-boot-mips/next? Thanks.

> 
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
> ---
> 
>  arch/mips/cpu/mips32/config.mk | 4 ++--
>  arch/mips/cpu/mips64/config.mk | 4 ++--
>  arch/nds32/config.mk           | 4 ++--
>  arch/riscv/config.mk           | 4 ++--
>  arch/sh/config.mk              | 2 +-
>  config.mk                      | 2 ++
>  examples/standalone/Makefile   | 4 +++-
>  7 files changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/mips/cpu/mips32/config.mk b/arch/mips/cpu/mips32/config.mk
> index a0247596f5..662e4f8fc8 100644
> --- a/arch/mips/cpu/mips32/config.mk
> +++ b/arch/mips/cpu/mips32/config.mk
> @@ -3,5 +3,5 @@
>  # (C) Copyright 2003
>  # Wolfgang Denk, DENX Software Engineering, <wd at denx.de>
>  
> -CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 \
> -			       -T $(srctree)/examples/standalone/mips.lds
> +CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000
> +LDFLAGS_STANDALONE	+= -T $(srctree)/examples/standalone/mips.lds
> diff --git a/arch/mips/cpu/mips64/config.mk b/arch/mips/cpu/mips64/config.mk
> index cd96bbcce9..6a53976b5c 100644
> --- a/arch/mips/cpu/mips64/config.mk
> +++ b/arch/mips/cpu/mips64/config.mk
> @@ -3,5 +3,5 @@
>  # (C) Copyright 2003
>  # Wolfgang Denk, DENX Software Engineering, <wd at denx.de>
>  
> -CONFIG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000 \
> -			       -T $(srctree)/examples/standalone/mips64.lds
> +CONFIG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000
> +LDFLAGS_STANDALONE	+= -T $(srctree)/examples/standalone/mips64.lds
> diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk
> index cb3d8b35b5..0a93fd428d 100644
> --- a/arch/nds32/config.mk
> +++ b/arch/nds32/config.mk
> @@ -12,8 +12,8 @@ ifeq ($(CROSS_COMPILE),)
>  CROSS_COMPILE := nds32le-linux-
>  endif
>  
> -CONFIG_STANDALONE_LOAD_ADDR = 0x300000 \
> -			      -T $(srctree)/examples/standalone/nds32.lds
> +CONFIG_STANDALONE_LOAD_ADDR = 0x300000
> +LDFLAGS_STANDALONE	+= -T $(srctree)/examples/standalone/nds32.lds
>  
>  PLATFORM_RELFLAGS	+= -fno-strict-aliasing -fno-common -mrelax
>  PLATFORM_RELFLAGS	+= -gdwarf-2
> diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk
> index 219e66683d..d0b7e8e88b 100644
> --- a/arch/riscv/config.mk
> +++ b/arch/riscv/config.mk
> @@ -27,8 +27,8 @@ PLATFORM_LDFLAGS	+= -m $(64bit-emul)
>  EFI_LDS			:= elf_riscv64_efi.lds
>  endif
>  
> -CONFIG_STANDALONE_LOAD_ADDR = 0x00000000 \
> -			      -T $(srctree)/examples/standalone/riscv.lds
> +CONFIG_STANDALONE_LOAD_ADDR = 0x00000000
> +LDFLAGS_STANDALONE += -T $(srctree)/examples/standalone/riscv.lds
>  
>  PLATFORM_CPPFLAGS	+= -ffixed-gp -fpic
>  PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -gdwarf-2 -ffunction-sections
> diff --git a/arch/sh/config.mk b/arch/sh/config.mk
> index 92abee17ad..6ef44638ab 100644
> --- a/arch/sh/config.mk
> +++ b/arch/sh/config.mk
> @@ -9,7 +9,7 @@ endif
>  
>  CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000
>  ifeq ($(CPU),sh2)
> -CONFIG_STANDALONE_LOAD_ADDR += -EB
> +LDFLAGS_STANDALONE += -EB
>  endif
>  
>  PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__
> diff --git a/config.mk b/config.mk
> index b4e4618982..caf0dd9b81 100644
> --- a/config.mk
> +++ b/config.mk
> @@ -15,6 +15,7 @@ PLATFORM_CPPFLAGS :=
>  PLATFORM_LDFLAGS :=
>  LDFLAGS :=
>  LDFLAGS_FINAL :=
> +LDFLAGS_STANDALONE :=
>  OBJCOPYFLAGS :=
>  # clear VENDOR for tcsh
>  VENDOR :=
> @@ -75,4 +76,5 @@ LDFLAGS_FINAL += -Bstatic
>  export PLATFORM_CPPFLAGS
>  export RELFLAGS
>  export LDFLAGS_FINAL
> +export LDFLAGS_STANDALONE
>  export CONFIG_STANDALONE_LOAD_ADDR
> diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
> index 09364d84a0..abe1bf1883 100644
> --- a/examples/standalone/Makefile
> +++ b/examples/standalone/Makefile
> @@ -45,6 +45,8 @@ endif
>  # source file.
>  ccflags-y += $(call cc-option,-fno-toplevel-reorder)
>  
> +LDFLAGS_STANDALONE	+= -Ttext $(CONFIG_STANDALONE_LOAD_ADDR)
> +
>  #########################################################################
>  
>  quiet_cmd_link_lib = LD      $@
> @@ -54,7 +56,7 @@ $(LIB):	$(LIBOBJS) FORCE
>  	$(call if_changed,link_lib)
>  
>  quiet_cmd_link_elf = LD      $@
> -      cmd_link_elf = $(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \
> +      cmd_link_elf = $(LD) $(LDFLAGS) $(LDFLAGS_STANDALONE) -g  \
>  		     -o $@ -e $(SYM_PREFIX)$(@F) $< $(LIB) $(PLATFORM_LIBGCC)
>  
>  $(ELF): $(obj)/%: $(obj)/%.o $(LIB) FORCE
> 

-- 
- Daniel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181028/2593aef8/attachment.sig>