diff options
| author | Lee Leahy <leroy.p.leahy@intel.com> | 2016-07-24 07:43:23 -0700 |
|---|---|---|
| committer | Lee Leahy <leroy.p.leahy@intel.com> | 2016-07-26 16:14:15 +0200 |
| commit | a7491502dc5c5cdb0c6b456be007157984f6b6d3 (patch) | |
| tree | 40a9a050b46bea19085fddbc881349b0fb8b8192 | |
| parent | 49d233006b52b804d6e97a12bf16fe38826e9d8a (diff) | |
arch/x86: Move postcar stage commands into place
Move the postcar commands to in between romstage and ramstage. Add the
stage header.
TEST=Build and run on Galileo Gen2
Change-Id: I530da6afd8ccbcea217995ddd27066df6d45de22
Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com>
Reviewed-on: https://review.coreboot.org/15844
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/arch/x86/Makefile.inc | 55 |
1 files changed, 30 insertions, 25 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index be50db1e56..3c00d3c7ff 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -259,6 +259,36 @@ romstage-S-ccopts += -g0 endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64 ############################################################################### +# postcar +############################################################################### + +$(eval $(call create_class_compiler,postcar,x86_32)) +postcar-generic-ccopts += -D__POSTCAR__ + +postcar-y += boot.c +postcar-y += cbfs_and_run.c +postcar-y += exit_car.S +postcar-y += memcpy.c +postcar-y += memmove.c +postcar-y += memset.c +postcar-y += memlayout.ld +postcar-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c +postcar-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c + +$(objcbfs)/postcar.debug: $$(postcar-objs) + @printf " LINK $(subst $(obj)/,,$(@))\n" + $(LD_postcar) $(LDFLAGS_postcar) -o $@ -L$(obj) $(COMPILER_RT_FLAGS_postcar) --whole-archive --start-group $(filter-out %.ld,$^) --no-whole-archive $(COMPILER_RT_postcar) --end-group -T $(call src-to-obj,postcar,src/arch/x86/memlayout.ld) + +$(objcbfs)/postcar.elf: $(objcbfs)/postcar.debug.rmod + cp $< $@ + +# Add postcar to CBFS +cbfs-files-$(CONFIG_POSTCAR_STAGE) += $(CONFIG_CBFS_PREFIX)/postcar +$(CONFIG_CBFS_PREFIX)/postcar-file := $(objcbfs)/postcar.elf +$(CONFIG_CBFS_PREFIX)/postcar-type := stage +$(CONFIG_CBFS_PREFIX)/postcar-compression := none + +############################################################################### # ramstage ############################################################################### @@ -391,28 +421,3 @@ rmodules_x86_64-y += memmove.c endif endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64 - -$(eval $(call create_class_compiler,postcar,x86_32)) -postcar-generic-ccopts += -D__POSTCAR__ - -postcar-y += boot.c -postcar-y += cbfs_and_run.c -postcar-y += exit_car.S -postcar-y += memset.c -postcar-y += memcpy.c -postcar-y += memmove.c -postcar-y += memlayout.ld -postcar-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c -postcar-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c - -$(objcbfs)/postcar.debug: $$(postcar-objs) - @printf " LINK $(subst $(obj)/,,$(@))\n" - $(LD_postcar) $(LDFLAGS_postcar) -o $@ -L$(obj) $(COMPILER_RT_FLAGS_postcar) --whole-archive --start-group $(filter-out %.ld,$^) --no-whole-archive $(COMPILER_RT_postcar) --end-group -T $(call src-to-obj,postcar,src/arch/x86/memlayout.ld) - -$(objcbfs)/postcar.elf: $(objcbfs)/postcar.debug.rmod - cp $< $@ - -cbfs-files-$(CONFIG_POSTCAR_STAGE) += $(CONFIG_CBFS_PREFIX)/postcar -$(CONFIG_CBFS_PREFIX)/postcar-file := $(objcbfs)/postcar.elf -$(CONFIG_CBFS_PREFIX)/postcar-type := stage -$(CONFIG_CBFS_PREFIX)/postcar-compression := none |