diff mbox series

[v2,1/5] Makefile: Build ELF, BIN and LD script in platform build directory

Message ID 20201018051449.2368918-2-anup.patel@wdc.com
State Accepted
Headers show
Series Builtin DTB improvements | expand

Commit Message

Anup Patel Oct. 18, 2020, 5:14 a.m. UTC 
Currently, the make rules for ELF, BIN and LD script are little
generic to allowing ELF, BIN and LD script to be anywhere in the
build directory. For OpenSBI firmwares, the ELF, BIN, and LD script
are always platform specific so we update make rules accordingly.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
---
 Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Anup Patel Oct. 19, 2020, 4:16 a.m. UTC | #1 
> -----Original Message-----
> From: Anup Patel <Anup.Patel@wdc.com>
> Sent: 18 October 2020 10:45
> To: Atish Patra <Atish.Patra@wdc.com>; Alistair Francis
> <Alistair.Francis@wdc.com>
> Cc: Damien Le Moal <Damien.LeMoal@wdc.com>; Anup Patel
> <anup@brainfault.org>; opensbi@lists.infradead.org; Anup Patel
> <Anup.Patel@wdc.com>
> Subject: [PATCH v2 1/5] Makefile: Build ELF, BIN and LD script in platform
> build directory
> 
> Currently, the make rules for ELF, BIN and LD script are little generic to
> allowing ELF, BIN and LD script to be anywhere in the build directory. For
> OpenSBI firmwares, the ELF, BIN, and LD script are always platform specific so
> we update make rules accordingly.
> 
> Signed-off-by: Anup Patel <anup.patel@wdc.com>
> Reviewed-by: Atish Patra <atish.patra@wdc.com>
> ---
>  Makefile | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 2a352ef..6c36f09 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -310,15 +310,6 @@ all: $(targets-y)
>  # Preserve all intermediate files
>  .SECONDARY:
> 
> -$(build_dir)/%.bin: $(build_dir)/%.elf
> -	$(call compile_objcopy,$@,$<)
> -
> -$(build_dir)/%.elf: $(build_dir)/%.o $(build_dir)/%.elf.ld
> $(platform_build_dir)/lib/libplatsbi.a
> -	$(call compile_elf,$@,$@.ld,$< $(platform_build_dir)/lib/libplatsbi.a)
> -
> -$(platform_build_dir)/%.ld: $(src_dir)/%.ldS
> -	$(call compile_cpp,$@,$<)
> -
>  $(build_dir)/lib/libsbi.a: $(libsbi-objs-path-y)
>  	$(call compile_ar,$@,$^)
> 
> @@ -340,6 +331,15 @@ $(build_dir)/%.dep: $(src_dir)/%.S
>  $(build_dir)/%.o: $(src_dir)/%.S
>  	$(call compile_as,$@,$<)
> 
> +$(platform_build_dir)/%.bin: $(platform_build_dir)/%.elf
> +	$(call compile_objcopy,$@,$<)
> +
> +$(platform_build_dir)/%.elf: $(platform_build_dir)/%.o
> $(platform_build_dir)/%.elf.ld $(platform_build_dir)/lib/libplatsbi.a
> +	$(call compile_elf,$@,$@.ld,$< $(platform_build_dir)/lib/libplatsbi.a)
> +
> +$(platform_build_dir)/%.ld: $(src_dir)/%.ldS
> +	$(call compile_cpp,$@,$<)
> +
>  $(platform_build_dir)/%.dep: $(platform_src_dir)/%.c
>  	$(call compile_cc_dep,$@,$<)
> 
> --
> 2.25.1

Applied this patch to the riscv/opensbi repo

Regards,
Anup
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 2a352ef..6c36f09 100644
--- a/Makefile
+++ b/Makefile
@@ -310,15 +310,6 @@  all: $(targets-y)
 # Preserve all intermediate files
 .SECONDARY:
 
-$(build_dir)/%.bin: $(build_dir)/%.elf
-	$(call compile_objcopy,$@,$<)
-
-$(build_dir)/%.elf: $(build_dir)/%.o $(build_dir)/%.elf.ld $(platform_build_dir)/lib/libplatsbi.a
-	$(call compile_elf,$@,$@.ld,$< $(platform_build_dir)/lib/libplatsbi.a)
-
-$(platform_build_dir)/%.ld: $(src_dir)/%.ldS
-	$(call compile_cpp,$@,$<)
-
 $(build_dir)/lib/libsbi.a: $(libsbi-objs-path-y)
 	$(call compile_ar,$@,$^)
 
@@ -340,6 +331,15 @@  $(build_dir)/%.dep: $(src_dir)/%.S
 $(build_dir)/%.o: $(src_dir)/%.S
 	$(call compile_as,$@,$<)
 
+$(platform_build_dir)/%.bin: $(platform_build_dir)/%.elf
+	$(call compile_objcopy,$@,$<)
+
+$(platform_build_dir)/%.elf: $(platform_build_dir)/%.o $(platform_build_dir)/%.elf.ld $(platform_build_dir)/lib/libplatsbi.a
+	$(call compile_elf,$@,$@.ld,$< $(platform_build_dir)/lib/libplatsbi.a)
+
+$(platform_build_dir)/%.ld: $(src_dir)/%.ldS
+	$(call compile_cpp,$@,$<)
+
 $(platform_build_dir)/%.dep: $(platform_src_dir)/%.c
 	$(call compile_cc_dep,$@,$<)