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
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.
e91d170 Remove libverstage as separate library and source file class
Makefile | 4 ++++
Makefile.inc | 7 +------
src/arch/arm/Makefile.inc | 4 ++--
src/arch/arm/armv4/Makefile.inc | 1 -
src/arch/arm/armv7/Makefile.inc | 6 ------
src/arch/arm64/Makefile.inc | 4 ++--
src/arch/arm64/armv8/Makefile.inc | 1 -
src/arch/x86/Makefile.inc | 2 +-
src/drivers/i2c/ww_ring/Makefile.inc | 4 ++--
src/drivers/intel/fsp1_1/Makefile.inc | 2 +-
src/lib/Makefile.inc | 6 +++---
src/soc/qualcomm/ipq40xx/Makefile.inc | 8 ++++----
src/soc/qualcomm/ipq806x/Makefile.inc | 8 ++++----
src/soc/rockchip/rk3288/Makefile.inc | 2 +-
src/vboot/Makefile.inc | 23 +++++++++++------------
toolchain.inc | 3 +--
16 files changed, 37 insertions(+), 48 deletions(-)