diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-12-07 12:33:54 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2018-12-14 08:09:20 +0100 |
| commit | 4722a3e6b716d9d4594c3cf3856b03bbd24a59a8 (patch) | |
| tree | 6db47fc7fb80c02ae0c311fad8a7f59f3e736e61 /arch/microblaze/Makefile | |
| parent | microblaze: move "... is ready" messages to arch/microblaze/Makefile (diff) | |
| download | linux-4722a3e6b716d9d4594c3cf3856b03bbd24a59a8.tar.xz linux-4722a3e6b716d9d4594c3cf3856b03bbd24a59a8.zip | |
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
ece97f3a5fb5 ("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 92a4728608a8 ("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>
Diffstat (limited to 'arch/microblaze/Makefile')
| -rw-r--r-- | arch/microblaze/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 6cee1ca86532..ff5abbd23060 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -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 |