diff options
| author | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-22 18:59:09 -0800 |
|---|---|---|
| committer | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-22 18:59:09 -0800 |
| commit | 5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb (patch) | |
| tree | b9f61d0544ed06b7f07000a11797711cdd97d83f /arch/riscv/boot/Makefile | |
| parent | 4a979862dde46b738316014ca4995eae2f428413 (diff) | |
| parent | 405fe7aa0dbaa6cb8cfe62771eee67076d30aca1 (diff) | |
| download | linux-stable-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.tar.gz linux-stable-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.tar.bz2 linux-stable-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.zip | |
Merge branch 'next/nommu' into for-next
Conflicts:
arch/riscv/boot/Makefile
arch/riscv/include/asm/sbi.h
Diffstat (limited to 'arch/riscv/boot/Makefile')
| -rw-r--r-- | arch/riscv/boot/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile index 88356650c992..a474f98ce4fa 100644 --- a/arch/riscv/boot/Makefile +++ b/arch/riscv/boot/Makefile @@ -16,7 +16,7 @@ OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S -targets := Image +targets := Image loader $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) @@ -24,6 +24,11 @@ $(obj)/Image: vmlinux FORCE $(obj)/Image.gz: $(obj)/Image FORCE $(call if_changed,gzip) +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 + $(obj)/Image.bz2: $(obj)/Image FORCE $(call if_changed,bzip2) |