Commit 4722a3e6 authored Dec 07, 2018 by Masahiro Yamada Committed by Michal Simek Dec 14, 2018

microblaze: fix multiple bugs in arch/microblaze/boot/Makefile



This commit fixes some build issues.

The first issue is the breakage of linux.bin.ub target since commit
ece97f3a ("microblaze: Fix simpleImage format generation")
because the addition of UIMAGE_{IN,OUT} affected it.

make ARCH=microblaze CROSS_COMPILE=microblaze-linux- linux.bin.ub
  [ snip ]
  OBJCOPY arch/microblaze/boot/linux.bin
  UIMAGE  arch/microblaze/boot/linux.bin.ub.ub
/usr/bin/mkimage: Can't open arch/microblaze/boot/linux.bin.ub: No such file or directory
make[1]: *** [arch/microblaze/boot/Makefile;14: arch/microblaze/boot/linux.bin.ub] Error 1
make: *** [arch/microblaze/Makefile;83: linux.bin.ub] Error 2

The second issue is the use of the "if_changed" multiple times for
the same target.

As commit 92a47286 ("x86/boot: Fix if_changed build flip/flop bug")
pointed out, this never works properly. Moreover, generating multiple
images as a side-effect is confusing.

Let's split the build recipe for each image.

simpleImage.<dt>*.unstrip is just a copy of vmlinux.

simpleImage.<dt> and simpleImage.<dt>.ub are created in the same way
as linux.bin and linux.bin.ub, respectively.

I kept simpleImage.* recipes independent of linux.bin.* ones to not
change the behavior.

Lastly, this commit fixes "make ARCH=microblaze clean". Previously,
it only cleaned up the unstrip image. Now, all the simpleImage files
are cleaned.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

parent 2e14f94c

arch/microblaze/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ linux.bin linux.bin.gz linux.bin.ub: vmlinux
		@echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')'

		simpleImage.%: vmlinux
		$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
		$(Q)$(MAKE) $(build)=$(boot) $(addprefix $(boot)/$@., ub unstrip strip)
		@echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')'

		define archhelp

arch/microblaze/boot/Makefile

+9 −10

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		# arch/microblaze/boot/Makefile
		#

		targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.%
		targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.*

		OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary

		@@ -16,21 +16,20 @@ $(obj)/linux.bin.ub: $(obj)/linux.bin FORCE
		$(obj)/linux.bin.gz: $(obj)/linux.bin FORCE
		$(call if_changed,gzip)

		quiet_cmd_cp = CP $< $@$2
		cmd_cp = cat $< >$@$2 \|\| (rm -f $@ && echo false)

		quiet_cmd_strip = STRIP $< $@$2
		cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \
		-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)
		$(obj)/simpleImage.$(DTB): vmlinux FORCE
		$(call if_changed,objcopy)

		$(obj)/simpleImage.$(DTB).ub: $(obj)/simpleImage.$(DTB) FORCE
		$(call if_changed,uimage)
		$(call if_changed,strip,.strip)

		clean-files += simpleImage.*.unstrip linux.bin.ub
		$(obj)/simpleImage.$(DTB).unstrip: vmlinux FORCE
		$(call if_changed,shipped)

		$(obj)/simpleImage.$(DTB).strip: vmlinux FORCE
		$(call if_changed,strip)

Admin message