From 018b831a369d6b3435bd1d6ecfe7b77915dd0acf Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Thu, 25 Aug 2016 10:18:09 -0700 Subject: [PATCH] Makefile: Don't hide the "prebuilt" kernel The pass 1 linkage on x86 produces a real intermediate file that users might plausibly want to inspect. There's no reason to give it a hidden file name or call it "temporary". Show it off. Change-Id: I606ee41f7f106ddd00474cdebe7803bcfb01889d Signed-off-by: Andy Ross --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e82ebd07a77..64bcf816a6c 100644 --- a/Makefile +++ b/Makefile @@ -834,9 +834,9 @@ linker.cmd: $(zephyr-deps) $(LDFLAG_LINKERCMD) $(LD_TOOLCHAIN) -I$(srctree)/include \ -I$(objtree)/include/generated $(EXTRA_LINKER_CMD_OPT) $(KBUILD_LDS) -o $@ -TMP_ELF = .tmp_$(KERNEL_NAME).prebuilt +PREBUILT_KERNEL = $(KERNEL_NAME)_prebuilt.elf -$(TMP_ELF): $(zephyr-deps) libzephyr.a $(KBUILD_ZEPHYR_APP) $(app-y) linker.cmd $(KERNEL_NAME).lnk +$(PREBUILT_KERNEL): $(zephyr-deps) libzephyr.a $(KBUILD_ZEPHYR_APP) $(app-y) linker.cmd $(KERNEL_NAME).lnk $(Q)$(CC) -T linker.cmd @$(KERNEL_NAME).lnk -o $@ quiet_cmd_gen_idt = SIDT $@ @@ -854,7 +854,7 @@ quiet_cmd_gen_idt = SIDT $@ rm staticIdt.bin irq_int_vector_map.bin isrList.bin \ ) -staticIdt.o: $(TMP_ELF) +staticIdt.o: $(PREBUILT_KERNEL) $(call cmd,gen_idt) quiet_cmd_lnk_elf = LINK $@ @@ -890,8 +890,8 @@ $(KERNEL_ELF_NAME): staticIdt.o linker.cmd @$(WARN_ABOUT_ASSERT) @$(WARN_ABOUT_DEPRECATION) else -$(KERNEL_ELF_NAME): $(TMP_ELF) - @cp $(TMP_ELF) $(KERNEL_ELF_NAME) +$(KERNEL_ELF_NAME): $(PREBUILT_KERNEL) + @cp $(PREBUILT_KERNEL) $(KERNEL_ELF_NAME) @$(WARN_ABOUT_ASSERT) @$(WARN_ABOUT_DEPRECATION) endif