e91d170d21
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>
88 lines
2.5 KiB
Makefile
88 lines
2.5 KiB
Makefile
##
|
|
## This file is part of the coreboot project.
|
|
##
|
|
## Copyright 2014 Google Inc.
|
|
##
|
|
## This program is free software; you can redistribute it and/or modify
|
|
## it under the terms of the GNU General Public License as published by
|
|
## the Free Software Foundation; version 2 of the License.
|
|
##
|
|
## This program is distributed in the hope that it will be useful,
|
|
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
## GNU General Public License for more details.
|
|
##
|
|
|
|
ifeq ($(CONFIG_SOC_QC_IPQ806X),y)
|
|
|
|
bootblock-y += clock.c
|
|
bootblock-y += gpio.c
|
|
bootblock-$(CONFIG_SPI_FLASH) += spi.c
|
|
bootblock-y += timer.c
|
|
bootblock-$(CONFIG_DRIVERS_UART) += uart.c
|
|
|
|
verstage-y += clock.c
|
|
verstage-y += gpio.c
|
|
verstage-y += gsbi.c
|
|
verstage-y += i2c.c
|
|
verstage-y += qup.c
|
|
verstage-y += spi.c
|
|
verstage-y += timer.c
|
|
verstage-$(CONFIG_DRIVERS_UART) += uart.c
|
|
|
|
romstage-y += clock.c
|
|
romstage-y += blobs_init.c
|
|
romstage-y += gpio.c
|
|
romstage-$(CONFIG_SPI_FLASH) += spi.c
|
|
romstage-y += timer.c
|
|
romstage-$(CONFIG_DRIVERS_UART) += uart.c
|
|
romstage-y += cbmem.c
|
|
|
|
ramstage-y += blobs_init.c
|
|
ramstage-y += cbmem.c
|
|
ramstage-y += clock.c
|
|
ramstage-y += gpio.c
|
|
ramstage-y += lcc.c
|
|
ramstage-y += soc.c
|
|
ramstage-$(CONFIG_SPI_FLASH) += spi.c
|
|
ramstage-y += timer.c
|
|
ramstage-y += uart.c # Want the UART always ready for the kernels' earlyprintk
|
|
ramstage-y += usb.c
|
|
ramstage-y += tz_wrapper.S
|
|
ramstage-y += gsbi.c
|
|
ramstage-y += i2c.c
|
|
ramstage-y += qup.c
|
|
ramstage-y += spi.c
|
|
|
|
ifeq ($(CONFIG_USE_BLOBS),y)
|
|
|
|
# Add MBN header to allow SBL3 to start coreboot bootblock
|
|
$(objcbfs)/bootblock.mbn: $(objcbfs)/bootblock.raw.bin
|
|
@printf " ADD MBN $(subst $(obj)/,,$(@))\n"
|
|
./util/ipqheader/ipqheader.py $(call loadaddr,bootblock) $< $@.tmp
|
|
@mv $@.tmp $@
|
|
|
|
# Create a complete bootblock which will start up the system
|
|
$(objcbfs)/bootblock.bin: $(call strip_quotes,$(CONFIG_SBL_BLOB)) \
|
|
$(objcbfs)/bootblock.mbn
|
|
@printf " MBNCAT $(subst $(obj)/,,$(@))\n"
|
|
@util/ipqheader/mbncat.py -o $@.tmp $^
|
|
@mv $@.tmp $@
|
|
|
|
endif
|
|
|
|
CPPFLAGS_common += -Isrc/soc/qualcomm/ipq806x/include
|
|
|
|
# List of binary blobs coreboot needs in CBFS to be able to boot up this SOC
|
|
mbn-files := cdt.mbn ddr.mbn rpm.mbn tz.mbn
|
|
|
|
# Location of the binary blobs
|
|
mbn-root := 3rdparty/blobs/cpu/qualcomm/ipq806x
|
|
|
|
# Create make variables to aid cbfs-files-handler in processing the blobs (add
|
|
# them all as raw binaries at the root level).
|
|
$(foreach f,$(mbn-files),$(eval cbfs-files-y += $(f))\
|
|
$(eval $(f)-file := $(mbn-root)/$(f))\
|
|
$(eval $(f)-type := raw))
|
|
|
|
endif
|