unicore32: simplify linker script generation for decompressor
diff mbox series

Message ID 1552023035-29826-1-git-send-email-yamada.masahiro@socionext.com
State New
Headers show
Series
  • unicore32: simplify linker script generation for decompressor
Related show

Commit Message

Masahiro Yamada March 8, 2019, 5:30 a.m. UTC
When I was searching for unneeded $(KCONFIG_CONFIG) usages, I noticed
this strange build dependency.

It can use $(call if_changed,...) in case ZTEXTADDR and ZBSSADDR are
changed, but even a simpler way is to use the pattern rule in
scripts/Makefile.build. This is what arch/arm/boot/compressed/Makefile
does.

I did only build test. I confirmed equivalent vmlinux.lds was generated.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/unicore32/boot/compressed/Makefile                          | 5 +----
 arch/unicore32/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} | 0
 2 files changed, 1 insertion(+), 4 deletions(-)
 rename arch/unicore32/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} (100%)

Comments

Masahiro Yamada March 13, 2019, 5:41 p.m. UTC | #1
On Fri, Mar 8, 2019 at 2:31 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> When I was searching for unneeded $(KCONFIG_CONFIG) usages, I noticed
> this strange build dependency.
>
> It can use $(call if_changed,...) in case ZTEXTADDR and ZBSSADDR are
> changed, but even a simpler way is to use the pattern rule in
> scripts/Makefile.build. This is what arch/arm/boot/compressed/Makefile
> does.
>
> I did only build test. I confirmed equivalent vmlinux.lds was generated.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---


Applied to linux-kbuild.



>  arch/unicore32/boot/compressed/Makefile                          | 5 +----
>  arch/unicore32/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} | 0
>  2 files changed, 1 insertion(+), 4 deletions(-)
>  rename arch/unicore32/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} (100%)
>
> diff --git a/arch/unicore32/boot/compressed/Makefile b/arch/unicore32/boot/compressed/Makefile
> index 9aecdd3..150fafc 100644
> --- a/arch/unicore32/boot/compressed/Makefile
> +++ b/arch/unicore32/boot/compressed/Makefile
> @@ -61,7 +61,4 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \
>  ZTEXTADDR      := 0x03000000
>  ZBSSADDR       := ALIGN(4)
>
> -SEDFLAGS_lds   = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
> -$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/unicore32/boot/Makefile $(KCONFIG_CONFIG)
> -       @sed "$(SEDFLAGS_lds)" < $< > $@
> -
> +CPPFLAGS_vmlinux.lds = -DTEXT_START="$(ZTEXTADDR)" -DBSS_START="$(ZBSSADDR)"
> diff --git a/arch/unicore32/boot/compressed/vmlinux.lds.in b/arch/unicore32/boot/compressed/vmlinux.lds.S
> similarity index 100%
> rename from arch/unicore32/boot/compressed/vmlinux.lds.in
> rename to arch/unicore32/boot/compressed/vmlinux.lds.S
> --
> 2.7.4
>

Patch
diff mbox series

diff --git a/arch/unicore32/boot/compressed/Makefile b/arch/unicore32/boot/compressed/Makefile
index 9aecdd3..150fafc 100644
--- a/arch/unicore32/boot/compressed/Makefile
+++ b/arch/unicore32/boot/compressed/Makefile
@@ -61,7 +61,4 @@  $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \
 ZTEXTADDR	:= 0x03000000
 ZBSSADDR	:= ALIGN(4)
 
-SEDFLAGS_lds	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
-$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/unicore32/boot/Makefile $(KCONFIG_CONFIG)
-	@sed "$(SEDFLAGS_lds)" < $< > $@
-
+CPPFLAGS_vmlinux.lds = -DTEXT_START="$(ZTEXTADDR)" -DBSS_START="$(ZBSSADDR)"
diff --git a/arch/unicore32/boot/compressed/vmlinux.lds.in b/arch/unicore32/boot/compressed/vmlinux.lds.S
similarity index 100%
rename from arch/unicore32/boot/compressed/vmlinux.lds.in
rename to arch/unicore32/boot/compressed/vmlinux.lds.S