| Message ID | 20191207212916.130825-1-olof@lixom.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | riscv: Fix build dependency for loader | expand |
On Sun, Dec 8, 2019 at 2:59 AM Olof Johansson <olof@lixom.net> 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 <hch@lst.de> > Signed-off-by: Olof Johansson <olof@lixom.net> LGTM. Reviewed-by: Anup Patel <anup@brainfault.org> 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 >
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 <hch@lst.de> > Signed-off-by: Olof Johansson <olof@lixom.net> Thanks, queued for v5.5-rc. - Paul
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
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 <hch@lst.de> Signed-off-by: Olof Johansson <olof@lixom.net> --- arch/riscv/boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)