2019-12-07 21:32:03

by Olof Johansson

Subject: [PATCH] riscv: Fix build dependency for loader

The Makefile addition for the flat image loader missed an obj prefix.

For most parallel builds this worked out fine, but with -j1 the dependency
wasn't fulfilled and thus fails:

arch/riscv/boot/loader.S: Assembler messages:
arch/riscv/boot/loader.S:7: Error: file not found: arch/riscv/boot/Image

Fixes: 405fe7aa0dba ("riscv: provide a flat image loader")
Cc: Christoph Hellwig <[email protected]>
Signed-off-by: Olof Johansson <[email protected]>
---
arch/riscv/boot/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile
index a474f98ce4fae..36db8145f9f46 100644
--- a/arch/riscv/boot/Makefile
+++ b/arch/riscv/boot/Makefile
@@ -24,7 +24,7 @@ $(obj)/Image: vmlinux FORCE
$(obj)/Image.gz: $(obj)/Image FORCE
$(call if_changed,gzip)

-loader.o: $(src)/loader.S $(obj)/Image
+$(obj)/loader.o: $(src)/loader.S $(obj)/Image

$(obj)/loader: $(obj)/loader.o $(obj)/Image $(obj)/loader.lds FORCE
$(Q)$(LD) -T $(obj)/loader.lds -o $@ $(obj)/loader.o
--
2.11.0

2019-12-08 05:32:43

by Anup Patel

Subject: Re: [PATCH] riscv: Fix build dependency for loader

On Sun, Dec 8, 2019 at 2:59 AM Olof Johansson <[email protected]> wrote:
>
> The Makefile addition for the flat image loader missed an obj prefix.
>
> For most parallel builds this worked out fine, but with -j1 the dependency
> wasn't fulfilled and thus fails:
>
> arch/riscv/boot/loader.S: Assembler messages:
> arch/riscv/boot/loader.S:7: Error: file not found: arch/riscv/boot/Image
>
> Fixes: 405fe7aa0dba ("riscv: provide a flat image loader")
> Cc: Christoph Hellwig <[email protected]>
> Signed-off-by: Olof Johansson <[email protected]>

LGTM.

Reviewed-by: Anup Patel <[email protected]>

Regards,
Anup

> ---
> arch/riscv/boot/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile
> index a474f98ce4fae..36db8145f9f46 100644
> --- a/arch/riscv/boot/Makefile
> +++ b/arch/riscv/boot/Makefile
> @@ -24,7 +24,7 @@ $(obj)/Image: vmlinux FORCE
> $(obj)/Image.gz: $(obj)/Image FORCE
> $(call if_changed,gzip)
>
> -loader.o: $(src)/loader.S $(obj)/Image
> +$(obj)/loader.o: $(src)/loader.S $(obj)/Image
>
> $(obj)/loader: $(obj)/loader.o $(obj)/Image $(obj)/loader.lds FORCE
> $(Q)$(LD) -T $(obj)/loader.lds -o $@ $(obj)/loader.o
> --
> 2.11.0
>

2019-12-09 14:56:56

by Paul Walmsley

Subject: Re: [PATCH] riscv: Fix build dependency for loader

On Sat, 7 Dec 2019, Olof Johansson wrote:

> The Makefile addition for the flat image loader missed an obj prefix.
>
> For most parallel builds this worked out fine, but with -j1 the dependency
> wasn't fulfilled and thus fails:
>
> arch/riscv/boot/loader.S: Assembler messages:
> arch/riscv/boot/loader.S:7: Error: file not found: arch/riscv/boot/Image
>
> Fixes: 405fe7aa0dba ("riscv: provide a flat image loader")
> Cc: Christoph Hellwig <[email protected]>
> Signed-off-by: Olof Johansson <[email protected]>

Thanks, queued for v5.5-rc.


- Paul