GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: provide common macro for linking early stages 

In order to support verstage on x86 one needs to link verstage
like romstage since it needs all the cache-as-ram goodies. Therefore,
provide a macro that one can invoke that provides the necessary
recipes for linking that particular stage in such an environment.

BUG=chrome-os-partner:44827
BRANCH=None
TEST=Built and booted glados.

Change-Id: I12f4872df09fff6715829de68fc374e230350c2e
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11739
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Aaron Durbin 2015-09-29 14:54:25 -05:00
parent 115360fdb3
commit 1bc6a79874
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/arch/x86/Makefile.inc
View File

@ -115,27 +115,44 @@ endif
endif # CONFIG_ARCH_BOOTBLOCK_X86_32 / CONFIG_ARCH_BOOTBLOCK_X86_64 endif # CONFIG_ARCH_BOOTBLOCK_X86_32 / CONFIG_ARCH_BOOTBLOCK_X86_64
############################################################################### ###############################################################################
# romstage # common support for early assembly includes
############################################################################### ###############################################################################
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
romstage-y += memlayout.ld
# Chipset specific assembly stubs in the romstage program flow. Certain # Chipset specific assembly stubs in the romstage program flow. Certain
# boards have more than one assembly stub so collect those and put them # boards have more than one assembly stub so collect those and put them
# into a single generated file. # into a single generated file.
crt0s = $(cpu_incs-y) crt0s = $(cpu_incs-y)
$(objgenerated)/romstage.inc: $$(crt0s) $(objgenerated)/assembly.inc: $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n" @printf " GEN $(subst $(obj)/,,$(@))\n"
printf '$(foreach crt0,$(crt0s),#include "$(crt0)"\n)' > $@ printf '$(foreach crt0,$(crt0s),#include "$(crt0)"\n)' > $@
define early_x86_stage
# $1 stage name
# $2 oformat
$(1)-y += memlayout.ld
# Add the assembly file that pulls in the rest of the dependencies in # Add the assembly file that pulls in the rest of the dependencies in
# the right order. Make sure the auto generated romstage.inc is a proper # the right order. Make sure the auto generated assembly.inc is a proper
# dependency. # dependency.
romstage-y += romstage.S $(1)-y += assembly_entry.S
$(obj)/arch/x86/romstage.romstage.o: $(objgenerated)/romstage.inc $$(obj)/arch/x86/assembly_entry.$(1).o: $(objgenerated)/assembly.inc
$$(objcbfs)/$(1).debug: $$$$($(1)-libs) $$$$($(1)-objs)
@printf " LINK $$(subst $$(obj)/,,$$(@))\n"
$$(LD_$(1)) $$(LDFLAGS_$(1)) -o $$@ -L$$(obj) $$(COMPILER_RT_FLAGS_$(1)) --whole-archive --start-group $$(filter-out %.ld,$$($(1)-objs)) $$($(1)-libs) --no-whole-archive $$(COMPILER_RT_$(1)) --end-group -T $$(obj)/arch/x86/memlayout.$(1).ld --oformat $(2)
LANG=C LC_ALL= $$(OBJCOPY_$(1)) --only-section .illegal_globals $$(@) $$(objcbfs)/$(1)_null.offenders 2>&1 | \
grep -v "Empty loadable segment detected" && \
$$(NM_$(1)) $$(objcbfs)/$(1)_null.offenders | grep -q ""; if [ $$$$? -eq 0 ]; then \
echo "Forbidden global variables in "$(1)":"; \
$$(NM_$(1)) $$(objcbfs)/$(1)_null.offenders; false; \
else true; fi
endef
###############################################################################
# romstage
###############################################################################
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
ifneq ($(CONFIG_ROMCC),y) ifneq ($(CONFIG_ROMCC),y)
@ -180,21 +197,11 @@ endif
romstage-libs ?= romstage-libs ?=
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y)
romstage-oformat=elf32-i386 $(eval $(call early_x86_stage,romstage,elf32-i386))
else else
romstage-oformat=elf64-x86-64 $(eval $(call early_x86_stage,romstage,elf64-x86-64))
endif endif
$(objcbfs)/romstage.debug: $$(romstage-objs) $$(romstage-libs)
@printf " LINK $(subst $(obj)/,,$(@))\n"
$(LD_romstage) $(LDFLAGS_romstage) -o $@ -L$(obj) $(COMPILER_RT_FLAGS_romstage) --whole-archive --start-group $(filter-out %.ld,$(romstage-objs)) $(romstage-libs) --no-whole-archive $(COMPILER_RT_romstage) --end-group -T $(obj)/arch/x86/memlayout.romstage.ld --oformat $(romstage-oformat)
LANG=C LC_ALL= $(OBJCOPY_romstage) --only-section .illegal_globals $(@) $(objcbfs)/romstage_null.offenders 2>&1 | \
grep -v "Empty loadable segment detected" && \
if [ -n "`$(NM_romstage) $(objcbfs)/romstage_null.offenders 2>/dev/null`" ]; then \
echo "Forbidden global variables in romstage:"; \
$(NM_romstage) $(objcbfs)/romstage_null.offenders; false; \
else true; fi
# Compiling crt0 with -g seems to trigger https://sourceware.org/bugzilla/show_bug.cgi?id=6428 # Compiling crt0 with -g seems to trigger https://sourceware.org/bugzilla/show_bug.cgi?id=6428
romstage-S-ccopts += -I. -g0 romstage-S-ccopts += -I. -g0

4
src/arch/x86/romstage.S → src/arch/x86/assembly_entry.S
View File

@ -29,9 +29,9 @@
#endif #endif
/* /*
* The romstage.inc is generated based on the requirements of the mainboard. * The assembly.inc is generated based on the requirements of the mainboard.
* For example, for ROMCC boards the MAINBOARDDIR/romstage.c would be * For example, for ROMCC boards the MAINBOARDDIR/romstage.c would be
* processed by ROMCC and added. In non-ROMCC boards the chipsets' * processed by ROMCC and added. In non-ROMCC boards the chipsets'
* cache-as-ram setup files would be here. * cache-as-ram setup files would be here.
*/ */
#include <generated/romstage.inc> #include <generated/assembly.inc>