[U-Boot] dtbo: Fix dtbo generation rules

Message ID 86549d7555ee880161b188070e48701835917089.1549893059.git.michal.simek@xilinx.com
State Accepted
Commit 1e7883f6325ae1cba2a92fcdf06d892f475fc5d2
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] dtbo: Fix dtbo generation rules
Related show

Commit Message

Michal Simek Feb. 11, 2019, 1:51 p.m.
Take the first prerequisite (dts overlay file) instead of standard
input.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Not sure how this was designed to take overlay as input.
What I have done was simply add overlay to arch/arm/dts folder and add
target with .dtbo suffix.

---
 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michal Simek Feb. 18, 2019, 11:20 a.m. | #1
Hi,

On 11. 02. 19 14:51, Michal Simek wrote:
> Take the first prerequisite (dts overlay file) instead of standard
> input.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
> Not sure how this was designed to take overlay as input.
> What I have done was simply add overlay to arch/arm/dts folder and add
> target with .dtbo suffix.
> 
> ---
>  scripts/Makefile.lib | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index a5b57fc6b98a..34b3fed6a0ba 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -317,7 +317,7 @@ quiet_cmd_dtco = DTCO    $@
>  # No generation of assembly file either
>  # Modified for U-Boot
>  cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
> -	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
> +	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
>  	$(DTC) -@ -O dtb -o $@ -b 0 \
>  		-i $(dir $<) $(DTC_FLAGS) \
>  		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
> 

Any issue with this?

Thanks,
Michal
Tom Rini Feb. 20, 2019, 1:58 a.m. | #2
On Mon, Feb 11, 2019 at 02:51:02PM +0100, Michal Simek wrote:

> Take the first prerequisite (dts overlay file) instead of standard
> input.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Applied to u-boot/master, thanks!

Patch

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index a5b57fc6b98a..34b3fed6a0ba 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -317,7 +317,7 @@  quiet_cmd_dtco = DTCO    $@
 # No generation of assembly file either
 # Modified for U-Boot
 cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
-	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
+	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
 	$(DTC) -@ -O dtb -o $@ -b 0 \
 		-i $(dir $<) $(DTC_FLAGS) \
 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \