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

vendorcode: Fixup AGESA PI Kconfig variables 

The *_SELECTED Kconfig variables are not needed with the
options contained within "if CPU_AMD_AGESA_BINARY_PI"
introduced in e4c17ce8. It also removes the need to
source and select the default prior to selecting the
AGESA source or AGESA PI option.

Change-Id: Iffa366f575f7f155bd6c7e7ece2a985f747c83be
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/10981
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Marc Jones 2015-07-19 16:20:41 -06:00
parent fb82ebe906
commit 74234ebd7b
2 changed files with 12 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/vendorcode/amd/Kconfig
View File

@ -21,8 +21,6 @@ if CPU_AMD_PI
menu "AMD Platform Initialization" menu "AMD Platform Initialization"
source src/vendorcode/amd/pi/Kconfig
choice choice
prompt "AGESA source" prompt "AGESA source"
default CPU_AMD_AGESA_BINARY_PI if CPU_AMD_PI default CPU_AMD_AGESA_BINARY_PI if CPU_AMD_PI
@ -50,39 +48,7 @@ config CPU_AMD_AGESA_OPENSOURCE
endchoice endchoice
if CPU_AMD_AGESA_BINARY_PI if CPU_AMD_AGESA_BINARY_PI
source src/vendorcode/amd/pi/Kconfig
config AGESA_BINARY_PI_PATH_DEFAULT_SELECTED
bool
default n
config AGESA_BINARY_PI_PATH
string "AGESA PI directory path"
default AGESA_BINARY_PI_PATH_DEFAULT if AGESA_BINARY_PI_PATH_DEFAULT_SELECTED
help
Specify where to find the AGESA headers and binary file
for AMD platform initialization.
config AGESA_BINARY_PI_FILE_DEFAULT_SELECTED
bool
default n
config AGESA_BINARY_PI_FILE
string "AGESA PI binary file name"
default AGESA_BINARY_PI_FILE_DEFAULT if AGESA_BINARY_PI_FILE_DEFAULT_SELECTED
help
Specify the binary file to use for AMD platform initialization.
config AGESA_BINARY_PI_LOCATION_DEFAULT_SELECTED
bool
default n
config AGESA_BINARY_PI_LOCATION
string "AGESA PI binary address in ROM"
default AGESA_BINARY_PI_LOCATION_DEFAULT if AGESA_BINARY_PI_FILE_DEFAULT_SELECTED
help
Specify the ROM address at which to store the binary Platform
Initialization code.
endif endif
endmenu endmenu

29
src/vendorcode/amd/pi/Kconfig
View File

@ -27,35 +27,28 @@
if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01
config AGESA_BINARY_PI_DEFAULTS # dummy config AGESA_BINARY_PI_PATH
def_bool y string "AGESA PI directory path"
select AGESA_BINARY_PI_LOCATION_DEFAULT_SELECTED
select AGESA_BINARY_PI_PATH_DEFAULT_SELECTED
select AGESA_BINARY_PI_FILE_DEFAULT_SELECTED
config AGESA_BINARY_PI_PATH_DEFAULT
string
default "3rdparty/blobs/pi/amd/00630F01" if CPU_AMD_PI_00630F01 default "3rdparty/blobs/pi/amd/00630F01" if CPU_AMD_PI_00630F01
default "3rdparty/blobs/pi/amd/00730F01" if CPU_AMD_PI_00730F01 default "3rdparty/blobs/pi/amd/00730F01" if CPU_AMD_PI_00730F01
default "3rdparty/blobs/pi/amd/00660F01" if CPU_AMD_PI_00660F01 default "3rdparty/blobs/pi/amd/00660F01" if CPU_AMD_PI_00660F01
help help
The default binary file name to use for AMD platform initialization. Specify where to find the AGESA headers and binary file
for AMD platform initialization.
config AGESA_BINARY_PI_FILE_DEFAULT config AGESA_BINARY_PI_FILE
string string "AGESA PI binary file name"
default "FP3/AGESA.bin" if CPU_AMD_PI_00630F01 default "FP3/AGESA.bin" if CPU_AMD_PI_00630F01
default "FT3b/AGESA.bin" if CPU_AMD_PI_00730F01 default "FT3b/AGESA.bin" if CPU_AMD_PI_00730F01
default "FP4/AGESA.bin" if CPU_AMD_PI_00660F01 default "FP4/AGESA.bin" if CPU_AMD_PI_00660F01
help help
The default binary file name to use for AMD platform initialization. Specify the binary file to use for AMD platform initialization.
config AGESA_BINARY_PI_LOCATION_DEFAULT config AGESA_BINARY_PI_LOCATION
hex string "AGESA PI binary address in ROM"
default 0xFFE00000 if CPU_AMD_PI_00630F01 default 0xFFE00000
default 0xFFE00000 if CPU_AMD_PI_00730F01
default 0xFFE00000 if CPU_AMD_PI_00660F01
help help
The default ROM address at which to store the binary Platform Specify the ROM address at which to store the binary Platform
Initialization code. Initialization code.
endif endif