[coreboot-gerrit] New patch to review for coreboot: vendorcode: Fixup AGESA PI Kconfig variables

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10981

-gerrit

commit 30e7453b7f3dfbd96730a56432582a284f24f7c8
Author: Marc Jones <marc.jones at se-eng.com>
Date:   Fri Jul 17 17:34:50 2015 -0600

    vendorcode: Fixup AGESA PI Kconfig variables
    
    The *_SELECTED Kconfig variable are not needed with the
    options contained within and 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 at se-eng.com>
---
 src/vendorcode/amd/Kconfig    | 36 +-----------------------------------
 src/vendorcode/amd/pi/Kconfig | 33 ++++++++++++---------------------
 2 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/src/vendorcode/amd/Kconfig b/src/vendorcode/amd/Kconfig
index 9720c79..3c66eaf 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 4f7a952..5af7658 100644
--- a/src/vendorcode/amd/pi/Kconfig
+++ b/src/vendorcode/amd/pi/Kconfig
@@ -27,35 +27,26 @@
 
 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
-	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
+config AGESA_BINARY_PI_FILE
+	string "AGESA PI binary file name"
+	default "AGESA.bin"
 	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