diff options
| author | Marc Jones <marc.jones@se-eng.com> | 2015-07-19 16:20:41 -0600 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2015-08-05 17:59:11 +0200 |
| commit | 74234ebd7b6029ef5a3f65dbdef17784a35055c6 (patch) | |
| tree | 09155734936701154774c6ba059ea89f70d2ff71 /src/vendorcode | |
| parent | fb82ebe9065e2160e662aee490d749ac31388fa6 (diff) | |
| download | coreboot-74234ebd7b6029ef5a3f65dbdef17784a35055c6.tar.xz | |
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>
Diffstat (limited to 'src/vendorcode')
| -rw-r--r-- | src/vendorcode/amd/Kconfig | 36 | ||||
| -rw-r--r-- | src/vendorcode/amd/pi/Kconfig | 29 |
2 files changed, 12 insertions, 53 deletions
diff --git a/src/vendorcode/amd/Kconfig b/src/vendorcode/amd/Kconfig index 2591cf90e8..5f00d899c6 100644 --- a/src/vendorcode/amd/Kconfig +++ b/src/vendorcode/amd/Kconfig @@ -21,8 +21,6 @@ if CPU_AMD_PI menu "AMD Platform Initialization" -source src/vendorcode/amd/pi/Kconfig - choice prompt "AGESA source" default CPU_AMD_AGESA_BINARY_PI if CPU_AMD_PI @@ -50,39 +48,7 @@ config CPU_AMD_AGESA_OPENSOURCE endchoice if CPU_AMD_AGESA_BINARY_PI - -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. - +source src/vendorcode/amd/pi/Kconfig endif endmenu diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig index 4f7a9521dd..5919b6b50a 100644 --- a/src/vendorcode/amd/pi/Kconfig +++ b/src/vendorcode/amd/pi/Kconfig @@ -27,35 +27,28 @@ if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 -config AGESA_BINARY_PI_DEFAULTS # dummy - def_bool y - 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 +config AGESA_BINARY_PI_PATH + string "AGESA PI directory path" 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/00660F01" if CPU_AMD_PI_00660F01 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 - string +config AGESA_BINARY_PI_FILE + string "AGESA PI binary file name" default "FP3/AGESA.bin" if CPU_AMD_PI_00630F01 default "FT3b/AGESA.bin" if CPU_AMD_PI_00730F01 default "FP4/AGESA.bin" if CPU_AMD_PI_00660F01 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 - hex - default 0xFFE00000 if CPU_AMD_PI_00630F01 - default 0xFFE00000 if CPU_AMD_PI_00730F01 - default 0xFFE00000 if CPU_AMD_PI_00660F01 +config AGESA_BINARY_PI_LOCATION + string "AGESA PI binary address in ROM" + default 0xFFE00000 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. endif |