The current Braswell FSP 1.1 header in vendorcode/intel, for which there is no publicly available FSP binary, contains silicon init UPDs which are not found in the publicly available header/binary in the FSP Github repo. This prevents new boards from being added which use the public Braswell FSP header/binary. To resolve this, move the UPDs not found in the public header from the soc's chip.c to ramstage.c for the boards which use them. Add a Kconfig option to use the current non-public FSP header and select it for boards which need it (google/cyan variants); set the public FSP option as the default. Use the Kconfig option to set FSP_HEADER_PATH to ensure the correct header is used. Test: build google/cyan and intel/strago using non-public and public FSP header/binaries respectively. Change-Id: I43cf18b98c844175a87b61fdbe4b0b24484e5702 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32381 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Frans Hendriks <fhendriks@eltan.com> Reviewed-by: Nico Huber <nico.h@gmx.de>
116 lines
3.1 KiB
Plaintext
116 lines
3.1 KiB
Plaintext
config BOARD_GOOGLE_BASEBOARD_CYAN
|
|
def_bool n
|
|
select BOARD_ROMSIZE_KB_8192
|
|
select EC_GOOGLE_CHROMEEC
|
|
select EC_GOOGLE_CHROMEEC_BOARDID
|
|
select EC_GOOGLE_CHROMEEC_MEC
|
|
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
|
|
select ENABLE_BUILTIN_COM1
|
|
select HAVE_ACPI_TABLES
|
|
select HAVE_OPTION_TABLE
|
|
select INTEL_GMA_HAVE_VBT
|
|
select MAINBOARD_HAS_CHROMEOS
|
|
select MAINBOARD_HAS_LPC_TPM
|
|
select MAINBOARD_HAS_TPM1
|
|
select SOC_INTEL_BRASWELL
|
|
select HAVE_ACPI_RESUME
|
|
select PCIEXP_L1_SUB_STATE if !BOARD_GOOGLE_CYAN
|
|
select SYSTEM_TYPE_LAPTOP
|
|
select USE_GOOGLE_FSP
|
|
|
|
if BOARD_GOOGLE_BASEBOARD_CYAN
|
|
|
|
config VBOOT
|
|
select EC_GOOGLE_CHROMEEC_SWITCHES
|
|
select VBOOT_LID_SWITCH
|
|
select VBOOT_VBNV_CMOS
|
|
|
|
config DISPLAY_SPD_DATA
|
|
bool "Display Memory Serial Presence Detect Data"
|
|
default n
|
|
help
|
|
When enabled displays the memory configuration data.
|
|
|
|
config MAINBOARD_DIR
|
|
string
|
|
default google/cyan
|
|
|
|
config MAINBOARD_FAMILY
|
|
string
|
|
default "Intel_Strago" if !BOARD_GOOGLE_CYAN
|
|
default ""
|
|
|
|
config VARIANT_DIR
|
|
string
|
|
default "banon" if BOARD_GOOGLE_BANON
|
|
default "celes" if BOARD_GOOGLE_CELES
|
|
default "cyan" if BOARD_GOOGLE_CYAN
|
|
default "edgar" if BOARD_GOOGLE_EDGAR
|
|
default "kefka" if BOARD_GOOGLE_KEFKA
|
|
default "reks" if BOARD_GOOGLE_REKS
|
|
default "relm" if BOARD_GOOGLE_RELM
|
|
default "setzer" if BOARD_GOOGLE_SETZER
|
|
default "terra" if BOARD_GOOGLE_TERRA
|
|
default "ultima" if BOARD_GOOGLE_ULTIMA
|
|
default "wizpig" if BOARD_GOOGLE_WIZPIG
|
|
|
|
config MAINBOARD_PART_NUMBER
|
|
string
|
|
default "Banon" if BOARD_GOOGLE_BANON
|
|
default "Celes" if BOARD_GOOGLE_CELES
|
|
default "Cyan" if BOARD_GOOGLE_CYAN
|
|
default "Edgar" if BOARD_GOOGLE_EDGAR
|
|
default "Kefka" if BOARD_GOOGLE_KEFKA
|
|
default "Reks" if BOARD_GOOGLE_REKS
|
|
default "Relm" if BOARD_GOOGLE_RELM
|
|
default "Setzer" if BOARD_GOOGLE_SETZER
|
|
default "Terra" if BOARD_GOOGLE_TERRA
|
|
default "Ultima" if BOARD_GOOGLE_ULTIMA
|
|
default "Wizpig" if BOARD_GOOGLE_WIZPIG
|
|
|
|
config MAINBOARD_VENDOR
|
|
string
|
|
default "Google"
|
|
|
|
config DEVICETREE
|
|
string
|
|
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
|
|
|
|
config VGA_BIOS_FILE
|
|
string
|
|
depends on VGA_BIOS
|
|
default "3rdparty/blobs/mainboard/intel/strago/vgabios.bin"
|
|
help
|
|
The C0 version of the video bios gets computed from this name
|
|
so that they can both be added. Only the correct one for the
|
|
system will be run.
|
|
|
|
config VGA_BIOS_ID
|
|
string
|
|
depends on VGA_BIOS
|
|
default "8086,22b0"
|
|
help
|
|
The VGA_BIOS_ID for the C0 version of the video bios is hardcoded
|
|
in soc/intel/braswell/Makefile.inc as 8086,22b1
|
|
|
|
config GBB_HWID
|
|
string
|
|
depends on CHROMEOS
|
|
default "BANON TEST A-A 8050" if BOARD_GOOGLE_BANON
|
|
default "CELES TEST A-A 5441" if BOARD_GOOGLE_CELES
|
|
default "CYAN TEST A-A 1829" if BOARD_GOOGLE_CYAN
|
|
default "EDGAR TEST A-A 2507" if BOARD_GOOGLE_EDGAR
|
|
default "KEFKA TEST A-A 5397" if BOARD_GOOGLE_KEFKA
|
|
default "REKS TEST A-A 3004" if BOARD_GOOGLE_REKS
|
|
default "RELM TEST A-A 2323" if BOARD_GOOGLE_RELM
|
|
default "SETZER TEST A-A 8721" if BOARD_GOOGLE_SETZER
|
|
default "TERRA TEST A-A 1650" if BOARD_GOOGLE_TERRA
|
|
default "ULTIMA TEST A-A 6017" if BOARD_GOOGLE_ULTIMA
|
|
default "WIZPIG TEST A-A 0597" if BOARD_GOOGLE_WIZPIG
|
|
|
|
config CBFS_SIZE
|
|
hex
|
|
default 0x200000
|
|
|
|
endif # BOARD_GOOGLE_BASEBOARD_CYAN
|