michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Makefile: Don't hide the "prebuilt" kernel

Browse source 
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 <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2016-08-25 10:18:09 -07:00 • committed by Andrew Boie
commit 018b831a36
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -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