diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 10:20:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 10:20:19 -0700 |
| commit | c0ab85267e25e34ce8b7e4429f0ef01fa0795b80 (patch) | |
| tree | 26bdf432b4812e67ffd6cf4abe08c4bb9cc2dddc /arch/microblaze/boot/Makefile | |
| parent | d987f62cce3289e42b83eb6c110c4745ea781bdf (diff) | |
| parent | a7a9e2f0410ddf9ec7491fca0c91fcb4c5c30cbb (diff) | |
| download | op-kernel-dev-c0ab85267e25e34ce8b7e4429f0ef01fa0795b80.zip op-kernel-dev-c0ab85267e25e34ce8b7e4429f0ef01fa0795b80.tar.gz | |
Merge tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Fix simpleImage format generation
- Remove earlyprintk support and replace it by earlycon
* tag 'microblaze-v4.18-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: dts: replace 'linux,stdout-path' with 'stdout-path'
microblaze: remove redundant early_printk support
microblaze: remove unnecessary prom.h includes
microblaze: Fix simpleImage format generation
Diffstat (limited to 'arch/microblaze/boot/Makefile')
| -rw-r--r-- | arch/microblaze/boot/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index fd46385..600e5a1 100644 --- a/arch/microblaze/boot/Makefile +++ b/arch/microblaze/boot/Makefile @@ -22,17 +22,19 @@ $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE quiet_cmd_cp = CP $< $@$2 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) -quiet_cmd_strip = STRIP $@ +quiet_cmd_strip = STRIP $< $@$2 cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \ - -K _fdt_start vmlinux -o $@ + -K _fdt_start $< -o $@$2 UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR) +UIMAGE_IN = $@ +UIMAGE_OUT = $@.ub $(obj)/simpleImage.%: vmlinux FORCE $(call if_changed,cp,.unstrip) $(call if_changed,objcopy) $(call if_changed,uimage) - $(call if_changed,strip) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' + $(call if_changed,strip,.strip) + @echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')' clean-files += simpleImage.*.unstrip linux.bin.ub |
