[PATCH] microblaze: Fix simpleImage format generation

[PATCH] microblaze: Fix simpleImage format generation

[Michal Simek]

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: Michal Simek <michal.simek@xilinx.com>
---

 arch/microblaze/boot/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
index fd46385a4c97..600e5a198bd2 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
-- 
1.9.1

Re: [PATCH] microblaze: Fix simpleImage format generation

[Michal Simek]

[-- Attachment #1.1: Type: text/plain, Size: 1830 bytes --]

On 10.4.2018 16:00, Michal Simek wrote:
> 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: Michal Simek <michal.simek@xilinx.com>
> ---
> 
>  arch/microblaze/boot/Makefile | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
> index fd46385a4c97..600e5a198bd2 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
> 

Applied.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]