diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-23 00:15:05 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-23 00:15:05 +0100 |
| commit | ac80010fc94eb0680d9a432b639583bd7ac29066 (patch) | |
| tree | 2de924c048910abfbfff52a3d5188a790ead379f /arch/riscv/boot/Makefile | |
| parent | Merge tag 'wireless-drivers-next-2019-12-20' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | Merge tag 'xfs-5.5-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
| download | linux-ac80010fc94eb0680d9a432b639583bd7ac29066.tar.xz linux-ac80010fc94eb0680d9a432b639583bd7ac29066.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Mere overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/riscv/boot/Makefile')
| -rw-r--r-- | arch/riscv/boot/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile index a474f98ce4fa..36db8145f9f4 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 |