fsp2_0: Clean up around `config FSP_USE_REPO`
We can make our lifes much easier by removing its dependency on `ADD_FSP_BINARIES`. Instead, we imply the latter if the repository is to be used. We can also hide a lot of unnecessary prompts in this case. Also, remove default overrides and selects for the two that are now unnecessary. Change-Id: I8538f2e966adc9da0fbea2250c954d86e42dfeb3 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39882 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Felix Singer <felixsinger@posteo.net> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
52a9599d07
commit
04da5d72d9
|
@ -31,8 +31,6 @@ make distclean
|
|||
touch .config
|
||||
./util/scripts/config --enable VENDOR_ASROCK
|
||||
./util/scripts/config --enable BOARD_ASROCK_H110M_DVS
|
||||
./util/scripts/config --enable CONFIG_ADD_FSP_BINARIES
|
||||
./util/scripts/config --enable CONFIG_FSP_USE_REPO
|
||||
./util/scripts/config --set-str REALTEK_8168_MACADDRESS "xx:xx:xx:xx:xx:xx"
|
||||
make olddefconfig
|
||||
```
|
||||
|
|
|
@ -2,8 +2,6 @@ CONFIG_USE_BLOBS=y
|
|||
CONFIG_VENDOR_INTEL=y
|
||||
CONFIG_INTEL_GMA_VBT_FILE="3rdparty/fsp/CoffeeLakeFspBinPkg/SampleCode/Vbt/Vbt.bin"
|
||||
CONFIG_BOARD_INTEL_COFFEELAKE_RVP11=y
|
||||
CONFIG_ADD_FSP_BINARIES=y
|
||||
CONFIG_USE_CANNONLAKE_FSP_CAR=y
|
||||
CONFIG_RUN_FSP_GOP=y
|
||||
CONFIG_FSP_USE_REPO=y
|
||||
CONFIG_PAYLOAD_NONE=y
|
||||
|
|
|
@ -31,11 +31,19 @@ config PLATFORM_USES_FSP2_1
|
|||
|
||||
if PLATFORM_USES_FSP2_0
|
||||
|
||||
config ADD_FSP_BINARIES
|
||||
bool "Add Intel FSP 2.0 binaries to CBFS"
|
||||
config FSP_USE_REPO
|
||||
bool "Use binaries of the Intel FSP repository on GitHub"
|
||||
depends on HAVE_INTEL_FSP_REPO
|
||||
default y
|
||||
help
|
||||
Add the FSP-M and FSP-S binaries to CBFS. Currently coreboot does not
|
||||
use the FSP-T binary and it is not added.
|
||||
When selecting this option, the SoC must set FSP_HEADER_PATH
|
||||
and FSP_FD_PATH correctly so FSP splitting works.
|
||||
|
||||
config ADD_FSP_BINARIES
|
||||
bool "Add Intel FSP 2.0 binaries to CBFS" if !FSP_USE_REPO
|
||||
default y if FSP_USE_REPO
|
||||
help
|
||||
Add the FSP-M and FSP-S binaries to CBFS.
|
||||
|
||||
config FSP_T_CBFS
|
||||
string "Name of FSP-T in CBFS"
|
||||
|
@ -50,31 +58,23 @@ config FSP_M_CBFS
|
|||
string "Name of FSP-M in CBFS"
|
||||
default "fspm.bin"
|
||||
|
||||
config FSP_USE_REPO
|
||||
bool "Use the IntelFSP based binaries"
|
||||
depends on ADD_FSP_BINARIES
|
||||
depends on HAVE_INTEL_FSP_REPO
|
||||
default y
|
||||
help
|
||||
When selecting this option, the SoC must set FSP_HEADER_PATH
|
||||
and FSP_FD_PATH correctly so FSP splitting works.
|
||||
|
||||
config FSP_T_FILE
|
||||
string "Intel FSP-T (temp RAM init) binary path and filename"
|
||||
string "Intel FSP-T (temp RAM init) binary path and filename" if !FSP_USE_REPO
|
||||
depends on ADD_FSP_BINARIES
|
||||
depends on FSP_CAR
|
||||
default "$(obj)/Fsp_T.fd" if FSP_USE_REPO
|
||||
help
|
||||
The path and filename of the Intel FSP-M binary for this platform.
|
||||
The path and filename of the Intel FSP-T binary for this platform.
|
||||
|
||||
config FSP_M_FILE
|
||||
string "Intel FSP-M (memory init) binary path and filename"
|
||||
string "Intel FSP-M (memory init) binary path and filename" if !FSP_USE_REPO
|
||||
depends on ADD_FSP_BINARIES
|
||||
default "$(obj)/Fsp_M.fd" if FSP_USE_REPO
|
||||
help
|
||||
The path and filename of the Intel FSP-M binary for this platform.
|
||||
|
||||
config FSP_S_FILE
|
||||
string "Intel FSP-S (silicon init) binary path and filename"
|
||||
string "Intel FSP-S (silicon init) binary path and filename" if !FSP_USE_REPO
|
||||
depends on ADD_FSP_BINARIES
|
||||
default "$(obj)/Fsp_S.fd" if FSP_USE_REPO
|
||||
help
|
||||
|
|
|
@ -44,12 +44,4 @@ config CBFS_SIZE
|
|||
hex
|
||||
default 0x600000
|
||||
|
||||
config ADD_FSP_BINARIES
|
||||
bool
|
||||
default y
|
||||
|
||||
config FSP_USE_REPO
|
||||
bool
|
||||
default y
|
||||
|
||||
endif
|
||||
|
|
|
@ -48,12 +48,4 @@ config CBFS_SIZE
|
|||
hex
|
||||
default 0x600000
|
||||
|
||||
config ADD_FSP_BINARIES
|
||||
bool
|
||||
default y
|
||||
|
||||
config FSP_USE_REPO
|
||||
bool
|
||||
default y
|
||||
|
||||
endif
|
||||
|
|
|
@ -14,8 +14,6 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select DRIVERS_I2C_HID
|
||||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select ADD_FSP_BINARIES
|
||||
select FSP_USE_REPO
|
||||
|
||||
# For now no way to choose the correct the available RAM
|
||||
config BOARD_RAZER_BLADE_STEALTH_KBL_16GB
|
||||
|
|
|
@ -2,7 +2,6 @@ if BOARD_SYSTEM76_LEMP9
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ADD_FSP_BINARIES
|
||||
select BOARD_ROMSIZE_KB_16384
|
||||
select EC_ACPI
|
||||
select HAVE_ACPI_RESUME
|
||||
|
|
|
@ -3,8 +3,6 @@ if BOARD_UP_SQUARED
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select USE_BLOBS
|
||||
select ADD_FSP_BINARIES
|
||||
select FSP_USE_REPO
|
||||
select HAVE_ACPI_TABLES
|
||||
select HAVE_ACPI_RESUME
|
||||
select INTEL_GMA_HAVE_VBT
|
||||
|
|
|
@ -720,7 +720,7 @@ while true ; do
|
|||
shift;;
|
||||
-B|--blobs) shift
|
||||
customizing="${customizing}, blobs"
|
||||
configoptions="${configoptions}CONFIG_USE_BLOBS=y\nCONFIG_USE_AMD_BLOBS=y\nCONFIG_ADD_FSP_BINARIES=y\nCONFIG_FSP_USE_REPO=y\n"
|
||||
configoptions="${configoptions}CONFIG_USE_BLOBS=y\nCONFIG_USE_AMD_BLOBS=y\nCONFIG_ADD_FSP_BINARIES=y\n"
|
||||
;;
|
||||
-A|--any-toolchain) shift
|
||||
customizing="${customizing}, any-toolchain"
|
||||
|
|
Loading…
Reference in New Issue