Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eac904dd authored by Michal Simek's avatar Michal Simek Committed by Greg Kroah-Hartman
Browse files

microblaze: Fix simpleImage format generation 



[ Upstream commit ece97f3a5fb50cf5f98886fbc63c9665f2bb199d ]

simpleImage generation was broken for some time. This patch is fixing
steps how simpleImage.*.ub file is generated. Steps are objdump of
vmlinux and create .ub.
Also make sure that there is striped elf version with .strip suffix.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d1a4095

arch/microblaze/boot/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -21,17 +21,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 dts/*.dtb