New patch to review for coreboot: d61f440 usbdebug: Hide irrelevent options from menuconfig

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4290

-gerrit

commit d61f4401acd790256035ba094e8286df89e90d45
Author: Kyösti Mälkki <[e-mail]>
Date:   Tue Sep 24 21:04:12 2013 +0300

    usbdebug: Hide irrelevent options from menuconfig
    
    No need to show the choice of USB port or controller in case of older
    hardware where location for usbdebug was hardwired.
    
    Change-Id: Ia186bf2c6ed60be2834cf6fd0a1965c8bf81ed4d
    Signed-off-by: Kyösti Mälkki <[e-mail]>
---
 src/console/Kconfig                      | 6 ++++--
 src/southbridge/amd/agesa/hudson/Kconfig | 4 ++--
 src/southbridge/amd/sb700/Kconfig        | 2 +-
 src/southbridge/amd/sb800/Kconfig        | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/console/Kconfig b/src/console/Kconfig
index ac3b8a1..ec8b09b 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -181,8 +181,9 @@ config USBDEBUG_IN_ROMSTAGE
 if USBDEBUG
 
 config USBDEBUG_HCD_INDEX
-	int "Index for EHCI controller to use with usbdebug"
+	int
 	default 0
+	prompt "Index for EHCI controller to use with usbdebug" if HAVE_USBDEBUG_OPTIONS
 	help
 	   Some boards have multiple EHCI controllers with possibly only
 	   one having the Debug Port capability on an external USB port.
@@ -192,8 +193,9 @@ config USBDEBUG_HCD_INDEX
 	   a working default value here.
 
 config USBDEBUG_DEFAULT_PORT
-	int "Default USB port to use as Debug Port"
+	int
 	default 0
+	prompt "Default USB port to use as Debug Port" if HAVE_USBDEBUG_OPTIONS
 	help
 	  Selects which physical USB port usbdebug dongle is connected to.
 	  Setting of 0 means to scan possible ports starting from 1.
diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index 7e7399c..1550cb4 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -20,13 +20,13 @@
 config SOUTHBRIDGE_AMD_AGESA_HUDSON
 	bool
 	select IOAPIC
-	select HAVE_USBDEBUG
+	select HAVE_USBDEBUG_OPTIONS
 	select HAVE_HARD_RESET
 
 config SOUTHBRIDGE_AMD_AGESA_YANGTZE
 	bool
 	select IOAPIC
-	select HAVE_USBDEBUG
+	select HAVE_USBDEBUG_OPTIONS
 	select HAVE_HARD_RESET
 
 if SOUTHBRIDGE_AMD_AGESA_HUDSON || SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/southbridge/amd/sb700/Kconfig b/src/southbridge/amd/sb700/Kconfig
index bde48fe..b0c92dc 100644
--- a/src/southbridge/amd/sb700/Kconfig
+++ b/src/southbridge/amd/sb700/Kconfig
@@ -25,7 +25,7 @@ if SOUTHBRIDGE_AMD_SB700
 config SOUTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select IOAPIC
-	select HAVE_USBDEBUG
+	select HAVE_USBDEBUG_OPTIONS
 	select HAVE_HARD_RESET
 
 # Set for southbridge SP5100 which also uses SB700 driver
diff --git a/src/southbridge/amd/sb800/Kconfig b/src/southbridge/amd/sb800/Kconfig
index 4708f1f..9547d3e 100644
--- a/src/southbridge/amd/sb800/Kconfig
+++ b/src/southbridge/amd/sb800/Kconfig
@@ -20,7 +20,7 @@
 config SOUTHBRIDGE_AMD_SB800
 	bool
 	select IOAPIC
-	select HAVE_USBDEBUG
+	select HAVE_USBDEBUG_OPTIONS
 	select HAVE_HARD_RESET
 
 if SOUTHBRIDGE_AMD_SB800