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

Remove libverstage as separate library and source file class 

In builds without CONFIG_VBOOT_SEPARATE_VERSTAGE, verstage files are
linked directly into the bootblock or the romstage. However, they're
still compiled with a separate "libverstage" source file class, linked
into an intermediate library and then linked into the final destination
stage.

There is no obvious benefit to doing it this way and it's unclear why it
was chosen in the first place... there are, however, obvious
disadvantages: it can result in code that is used by both libverstage
and the host stage to occur twice in the output binary. It also means
that libverstage files have their separate compiler flags that are not
necessarily aligned with the host stage, which can lead to weird effects
like <rules.h> macros not being set the way you would expect. In fact,
VBOOT_STARTS_IN_ROMSTAGE configurations are currently broken on x86
because their libverstage code that gets compiled into the romstage sets
ENV_VERSTAGE, but CAR migration code expects all ENV_VERSTAGE code to
run pre-migration.

This patch resolves these problems by removing the separate library.
There is no more difference between the 'verstage' and 'libverstage'
classes, and the source files added to them are just treated the same
way a bootblock or romstage source files in configurations where the
verstage is linked into either of these respective stages (allowing for
the normal object code deduplication and causing those files to be
compiled with the same flags as the host stage's files).

Tested this whole series by booting a Kevin, an Elm (both with and
without SEPARATE_VERSTAGE) and a Falco in normal and recovery mode.

Change-Id: I6bb84a9bf1cd54f2e02ca1f665740a9c88d88df4
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/18302
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Julius Werner 2017-03-20 15:32:15 -07:00
parent 58c3938705
commit e91d170d21
16 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -243,11 +243,15 @@ evaluate_subdirs= \
# collect all object files eligible for building # collect all object files eligible for building
subdirs:=$(TOPLEVEL) subdirs:=$(TOPLEVEL)
postinclude-hooks :=
$(eval $(call evaluate_subdirs)) $(eval $(call evaluate_subdirs))
ifeq ($(FAILBUILD),1) ifeq ($(FAILBUILD),1)
$(error cannot continue build) $(error cannot continue build)
endif endif
# Run hooks registered by subdirectories that need to be evaluated after all files have been parsed
$(eval $(postinclude-hooks))
# Eliminate duplicate mentions of source files in a class # Eliminate duplicate mentions of source files in a class
$(foreach class,$(classes),$(eval $(class)-srcs:=$(sort $($(class)-srcs)))) $(foreach class,$(classes),$(eval $(class)-srcs:=$(sort $($(class)-srcs))))

7
Makefile.inc
View File

@ -97,7 +97,7 @@ subdirs-y += util/checklist
####################################################################### #######################################################################
# Add source classes and their build options # Add source classes and their build options
classes-y := ramstage romstage bootblock postcar smm smmstub cpu_microcode libverstage verstage classes-y := ramstage romstage bootblock postcar smm smmstub cpu_microcode verstage
# Add dynamic classes for rmodules # Add dynamic classes for rmodules
$(foreach supported_arch,$(ARCH_SUPPORTED), \ $(foreach supported_arch,$(ARCH_SUPPORTED), \
@ -200,7 +200,6 @@ endif
ramstage-c-deps:=$$(OPTION_TABLE_H) ramstage-c-deps:=$$(OPTION_TABLE_H)
romstage-c-deps:=$$(OPTION_TABLE_H) romstage-c-deps:=$$(OPTION_TABLE_H)
libverstage-c-deps:=$$(OPTION_TABLE_H)
verstage-c-deps:=$$(OPTION_TABLE_H) verstage-c-deps:=$$(OPTION_TABLE_H)
bootblock-c-deps:=$$(OPTION_TABLE_H) bootblock-c-deps:=$$(OPTION_TABLE_H)
$(foreach type,ads adb, \ $(foreach type,ads adb, \
@ -528,10 +527,6 @@ romstage-y+=$(DEVICETREE_STATIC_C)
verstage-y+=$(DEVICETREE_STATIC_C) verstage-y+=$(DEVICETREE_STATIC_C)
bootblock-y+=$(DEVICETREE_STATIC_C) bootblock-y+=$(DEVICETREE_STATIC_C)
$(objgenerated)/libverstage.a: $$(libverstage-objs)
rm -f $@
$(AR_libverstage) rcsT $@ $^
####################################################################### #######################################################################
# Clean up rules # Clean up rules
clean-abuild: clean-abuild:

4
src/arch/arm/Makefile.inc
View File

@ -68,9 +68,9 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARM
ifeq ($(CONFIG_ARCH_VERSTAGE_ARM),y) ifeq ($(CONFIG_ARCH_VERSTAGE_ARM),y)
$(objcbfs)/verstage.debug: $(objgenerated)/libverstage.a $$(verstage-objs) $(objcbfs)/verstage.debug: $$(verstage-objs)
@printf " LINK $(subst $(obj)/,,$(@))\n" @printf " LINK $(subst $(obj)/,,$(@))\n"
$(LD_verstage) $(LDFLAGS_verstage) -o $@ -L$(obj) -T $(call src-to-obj,verstage,src/mainboard/$(MAINBOARDDIR)/memlayout.ld) --whole-archive --start-group $(filter-out %.ld,$(verstage-objs)) $(objgenerated)/libverstage.a --end-group $(LD_verstage) $(LDFLAGS_verstage) -o $@ -L$(obj) -T $(call src-to-obj,verstage,src/mainboard/$(MAINBOARDDIR)/memlayout.ld) --whole-archive --start-group $(filter-out %.ld,$(verstage-objs)) --end-group
verstage-y += boot.c verstage-y += boot.c
verstage-y += div0.c verstage-y += div0.c

1
src/arch/arm/armv4/Makefile.inc
View File

@ -39,7 +39,6 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARMV4
################################################################################ ################################################################################
ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV4),y) ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV4),y)
libverstage-generic-ccopts += $(armv4_flags)
verstage-generic-ccopts += $(armv4_flags) verstage-generic-ccopts += $(armv4_flags)
verstage-y += cache.c verstage-y += cache.c

6
src/arch/arm/armv7/Makefile.inc
View File

@ -71,8 +71,6 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARMV7
################################################################################ ################################################################################
ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV7),y) ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV7),y)
libverstage-generic-ccopts += $(armv7-a_flags)
libverstage-S-ccopts += $(armv7_asm_flags)
verstage-generic-ccopts += $(armv7-a_flags) verstage-generic-ccopts += $(armv7-a_flags)
verstage-S-ccopts += $(armv7_asm_flags) verstage-S-ccopts += $(armv7_asm_flags)
@ -83,14 +81,10 @@ verstage-y += exception_asm.S
verstage-y += mmu.c verstage-y += mmu.c
else ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV7_M),y) else ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV7_M),y)
libverstage-generic-ccopts += $(armv7-m_flags)
libverstage-S-ccopts += $(armv7_asm_flags)
verstage-generic-ccopts += $(armv7-m_flags) verstage-generic-ccopts += $(armv7-m_flags)
verstage-S-ccopts += $(armv7_asm_flags) verstage-S-ccopts += $(armv7_asm_flags)
else ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV7_R),y) else ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV7_R),y)
libverstage-generic-ccopts += $(armv7-r_flags)
libverstage-S-ccopts += $(armv7-r_asm_flags)
verstage-generic-ccopts += $(armv7-r_flags) verstage-generic-ccopts += $(armv7-r_flags)
verstage-S-ccopts += $(armv7-r_asm_flags) verstage-S-ccopts += $(armv7-r_asm_flags)

4
src/arch/arm64/Makefile.inc
View File

@ -65,9 +65,9 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARM64
ifeq ($(CONFIG_ARCH_VERSTAGE_ARM64),y) ifeq ($(CONFIG_ARCH_VERSTAGE_ARM64),y)
$(objcbfs)/verstage.debug: $(objgenerated)/libverstage.a $$(verstage-objs) $(objcbfs)/verstage.debug: $$(verstage-objs)
@printf " LINK $(subst $(obj)/,,$(@))\n" @printf " LINK $(subst $(obj)/,,$(@))\n"
$(LD_verstage) $(LDFLAGS_verstage) -o $@ -L$(obj) --whole-archive --start-group $(filter-out %.ld,$(verstage-objs)) $(objgenerated)/libverstage.a --end-group -T $(call src-to-obj,verstage,src/mainboard/$(MAINBOARDDIR)/memlayout.ld) $(LD_verstage) $(LDFLAGS_verstage) -o $@ -L$(obj) --whole-archive --start-group $(filter-out %.ld,$(verstage-objs)) --end-group -T $(call src-to-obj,verstage,src/mainboard/$(MAINBOARDDIR)/memlayout.ld)
verstage-y += boot.c verstage-y += boot.c
verstage-y += div0.c verstage-y += div0.c

1
src/arch/arm64/armv8/Makefile.inc
View File

@ -53,7 +53,6 @@ verstage-y += cpu.S
verstage-y += cache_helpers.S verstage-y += cache_helpers.S
verstage-y += exception.c verstage-y += exception.c
libverstage-generic-ccopts += $(armv8_flags)
verstage-generic-ccopts += $(armv8_flags) verstage-generic-ccopts += $(armv8_flags)
endif endif

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

@ -186,7 +186,7 @@ verstage-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += verstage.c
verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
verstage-libs += $(objgenerated)/libverstage.a verstage-libs ?=
$(eval $(call early_x86_assembly_entry_rule,verstage)) $(eval $(call early_x86_assembly_entry_rule,verstage))

4
src/drivers/i2c/ww_ring/Makefile.inc
View File

@ -1,5 +1,5 @@
libverstage-$(CONFIG_DRIVERS_I2C_WW_RING) += ww_ring.c verstage-$(CONFIG_DRIVERS_I2C_WW_RING) += ww_ring.c
libverstage-$(CONFIG_DRIVERS_I2C_WW_RING) += ww_ring_programs.c verstage-$(CONFIG_DRIVERS_I2C_WW_RING) += ww_ring_programs.c
ramstage-$(CONFIG_DRIVERS_I2C_WW_RING) += ww_ring.c ramstage-$(CONFIG_DRIVERS_I2C_WW_RING) += ww_ring.c
ramstage-$(CONFIG_DRIVERS_I2C_WW_RING) += ww_ring_programs.c ramstage-$(CONFIG_DRIVERS_I2C_WW_RING) += ww_ring_programs.c

2
src/drivers/intel/fsp1_1/Makefile.inc
View File

@ -18,7 +18,7 @@ ifeq ($(CONFIG_PLATFORM_USES_FSP1_1),y)
verstage-y += car.c verstage-y += car.c
verstage-y += fsp_util.c verstage-y += fsp_util.c
verstage-y += verstage.c verstage-$(CONFIG_SEPARATE_VERSTAGE) += verstage.c
bootblock-y += bootblock.c bootblock-y += bootblock.c
bootblock-y += fsp_util.c bootblock-y += fsp_util.c

6
src/lib/Makefile.inc
View File

@ -50,9 +50,9 @@ verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
verstage-y += boot_device.c verstage-y += boot_device.c
verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
libverstage-$(CONFIG_TPM) += tlcl.c verstage-$(CONFIG_TPM) += tlcl.c
libverstage-$(CONFIG_TPM2) += tpm2_marshaling.c verstage-$(CONFIG_TPM2) += tpm2_marshaling.c
libverstage-$(CONFIG_TPM2) += tpm2_tlcl.c verstage-$(CONFIG_TPM2) += tpm2_tlcl.c
ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y) ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)
romstage-$(CONFIG_TPM) += tlcl.c romstage-$(CONFIG_TPM) += tlcl.c

8
src/soc/qualcomm/ipq40xx/Makefile.inc
View File

@ -24,10 +24,10 @@ bootblock-$(CONFIG_DRIVERS_UART) += uart.c
verstage-y += clock.c verstage-y += clock.c
verstage-y += gpio.c verstage-y += gpio.c
libverstage-y += blsp.c verstage-y += blsp.c
libverstage-y += i2c.c verstage-y += i2c.c
libverstage-y += qup.c verstage-y += qup.c
libverstage-y += spi.c verstage-y += spi.c
verstage-y += timer.c verstage-y += timer.c
verstage-$(CONFIG_DRIVERS_UART) += uart.c verstage-$(CONFIG_DRIVERS_UART) += uart.c

8
src/soc/qualcomm/ipq806x/Makefile.inc
View File

@ -23,10 +23,10 @@ bootblock-$(CONFIG_DRIVERS_UART) += uart.c
verstage-y += clock.c verstage-y += clock.c
verstage-y += gpio.c verstage-y += gpio.c
libverstage-y += gsbi.c verstage-y += gsbi.c
libverstage-y += i2c.c verstage-y += i2c.c
libverstage-y += qup.c verstage-y += qup.c
libverstage-y += spi.c verstage-y += spi.c
verstage-y += timer.c verstage-y += timer.c
verstage-$(CONFIG_DRIVERS_UART) += uart.c verstage-$(CONFIG_DRIVERS_UART) += uart.c

2
src/soc/rockchip/rk3288/Makefile.inc
View File

@ -37,7 +37,7 @@ verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c
verstage-y += ../common/gpio.c verstage-y += ../common/gpio.c
verstage-y += gpio.c verstage-y += gpio.c
verstage-y += clock.c verstage-y += clock.c
libverstage-y += crypto.c verstage-y += crypto.c
verstage-y += ../common/i2c.c verstage-y += ../common/i2c.c
verstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c verstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c

23
src/vboot/Makefile.inc
View File

@ -21,7 +21,6 @@ ramstage-y += bootmode.c
verstage-y += bootmode.c verstage-y += bootmode.c
postcar-y += bootmode.c postcar-y += bootmode.c
libverstage-generic-ccopts += -D__PRE_RAM__ -D__VERSTAGE__
verstage-generic-ccopts += -D__PRE_RAM__ -D__VERSTAGE__ verstage-generic-ccopts += -D__PRE_RAM__ -D__VERSTAGE__
bootblock-y += vbnv.c bootblock-y += vbnv.c
@ -62,14 +61,14 @@ ramstage-y += vboot_common.c
postcar-y += vboot_common.c postcar-y += vboot_common.c
bootblock-y += common.c bootblock-y += common.c
libverstage-y += vboot_logic.c verstage-y += vboot_logic.c
verstage-y += common.c verstage-y += common.c
verstage-y += verstage.c verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += verstage.c
ifeq (${CONFIG_VBOOT_MOCK_SECDATA},y) ifeq (${CONFIG_VBOOT_MOCK_SECDATA},y)
libverstage-y += secdata_mock.c verstage-y += secdata_mock.c
romstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += secdata_mock.c romstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += secdata_mock.c
else else
libverstage-y += secdata_tpm.c verstage-y += secdata_tpm.c
romstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += secdata_tpm.c romstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += secdata_tpm.c
endif endif
romstage-y += vboot_handoff.c common.c romstage-y += vboot_handoff.c common.c
@ -88,9 +87,9 @@ endif
endif # CONFIG_VBOOT_SEPARATE_VERSTAGE endif # CONFIG_VBOOT_SEPARATE_VERSTAGE
VB2_LIB = $(obj)/external/vboot_reference/vboot_fw20.a VB2_LIB = $(obj)/external/vboot_reference/vboot_fw20.a
VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%, $(filter-out -I$(obj), $(filter-out -include $(src)/include/kconfig.h, $(CPPFLAGS_libverstage)))) VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%, $(filter-out -I$(obj), $(filter-out -include $(src)/include/kconfig.h, $(CPPFLAGS_verstage))))
VBOOT_CFLAGS += $(CFLAGS_libverstage) VBOOT_CFLAGS += $(CFLAGS_verstage)
VBOOT_CFLAGS += $(libverstage-c-ccopts) VBOOT_CFLAGS += $(verstage-c-ccopts)
VBOOT_CFLAGS += -I$(abspath $(obj)) -include $(top)/src/include/kconfig.h -Wno-missing-prototypes VBOOT_CFLAGS += -I$(abspath $(obj)) -include $(top)/src/include/kconfig.h -Wno-missing-prototypes
VBOOT_CFLAGS += -DVBOOT_DEBUG VBOOT_CFLAGS += -DVBOOT_DEBUG
@ -104,7 +103,7 @@ $(VB2_LIB): $(obj)/config.h
V=$(V) \ V=$(V) \
fwlib20 fwlib20
libverstage-srcs += $(VB2_LIB) verstage-srcs += $(VB2_LIB)
ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y) ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)
@ -131,11 +130,11 @@ endif
endif endif
else else # CONFIG_VBOOT_SEPARATE_VERSTAGE
ifeq ($(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK),y) ifeq ($(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK),y)
bootblock-srcs += $(objgenerated)/libverstage.a postinclude-hooks += $$(eval bootblock-srcs += $$(verstage-srcs))
else else
romstage-srcs += $(objgenerated)/libverstage.a postinclude-hooks += $$(eval romstage-srcs += $$(verstage-srcs))
endif endif
endif # CONFIG_VBOOT_SEPARATE_VERSTAGE endif # CONFIG_VBOOT_SEPARATE_VERSTAGE

3
toolchain.inc
View File

@ -47,8 +47,7 @@ HOSTCXX:=CCC_CXX="$(HOSTCXX)" $(CXX)
ROMCC=CCC_CC="$(ROMCC_BIN)" $(CC) ROMCC=CCC_CC="$(ROMCC_BIN)" $(CC)
endif endif
COREBOOT_STANDARD_STAGES := bootblock libverstage verstage romstage ramstage COREBOOT_STANDARD_STAGES := bootblock verstage romstage ramstage
MAP-libverstage := verstage
ARCHDIR-i386 := x86 ARCHDIR-i386 := x86
ARCHDIR-x86_32 := x86 ARCHDIR-x86_32 := x86