4722a3e6b7
This commit fixes some build issues. The first issue is the breakage of linux.bin.ub target since commitece97f3a5f("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 commit92a4728608("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>
36 lines
893 B
Makefile
36 lines
893 B
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# arch/microblaze/boot/Makefile
|
|
#
|
|
|
|
targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.*
|
|
|
|
OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary
|
|
|
|
$(obj)/linux.bin: vmlinux FORCE
|
|
$(call if_changed,objcopy)
|
|
|
|
$(obj)/linux.bin.ub: $(obj)/linux.bin FORCE
|
|
$(call if_changed,uimage)
|
|
|
|
$(obj)/linux.bin.gz: $(obj)/linux.bin FORCE
|
|
$(call if_changed,gzip)
|
|
|
|
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)
|
|
|
|
$(obj)/simpleImage.$(DTB): vmlinux FORCE
|
|
$(call if_changed,objcopy)
|
|
|
|
$(obj)/simpleImage.$(DTB).ub: $(obj)/simpleImage.$(DTB) FORCE
|
|
$(call if_changed,uimage)
|
|
|
|
$(obj)/simpleImage.$(DTB).unstrip: vmlinux FORCE
|
|
$(call if_changed,shipped)
|
|
|
|
$(obj)/simpleImage.$(DTB).strip: vmlinux FORCE
|
|
$(call if_changed,strip)
|