aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/boot/Makefile
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2020-07-21 22:20:19 -0700
committerMax Filippov <jcmvbkbc@gmail.com>2020-07-28 00:57:06 -0700
commit65898b375659f2556da9ac22ea5649407f6f6447 (patch)
tree69d9b325463b7f8eca32208607f2a0389b52ed57 /arch/xtensa/boot/Makefile
parentxtensa: initialize_mmu.h: fix a duplicated word (diff)
downloadlinux-dev-65898b375659f2556da9ac22ea5649407f6f6447.tar.xz
linux-dev-65898b375659f2556da9ac22ea5649407f6f6447.zip
xtensa: move vmlinux.bin[.gz] to boot subdirectory
vmlinux.bin and vmlinux.bin.gz are always rebuilt in the kernel build process. Add them to 'targets' and move them to the boot subdirectory where their rules are. Update make rules that refer to them. Reviewed-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/boot/Makefile')
-rw-r--r--arch/xtensa/boot/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
index 1a14d38d9b33..801fe30b4dfe 100644
--- a/arch/xtensa/boot/Makefile
+++ b/arch/xtensa/boot/Makefile
@@ -17,6 +17,7 @@ BIG_ENDIAN := $(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
export BIG_ENDIAN
subdir-y := lib
+targets += vmlinux.bin vmlinux.bin.gz
# Subdirs for the boot loader(s)
@@ -35,19 +36,19 @@ boot-elf boot-redboot: $(addprefix $(obj)/,$(subdir-y))
OBJCOPYFLAGS = --strip-all -R .comment -R .notes -O binary
-vmlinux.bin: vmlinux FORCE
+$(obj)/vmlinux.bin: vmlinux FORCE
$(call if_changed,objcopy)
-vmlinux.bin.gz: vmlinux.bin FORCE
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
$(call if_changed,gzip)
-boot-elf: vmlinux.bin
-boot-redboot: vmlinux.bin.gz
+boot-elf: $(obj)/vmlinux.bin
+boot-redboot: $(obj)/vmlinux.bin.gz
UIMAGE_LOADADDR = $(CONFIG_KERNEL_LOAD_ADDRESS)
UIMAGE_COMPRESSION = gzip
-$(obj)/uImage: vmlinux.bin.gz FORCE
+$(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE
$(call if_changed,uimage)
$(Q)$(kecho) ' Kernel: $@ is ready'