x86: ivybridge: Drop CONFIG_USBDEBUG

This is not used anywhere. Clean this up.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index a5697a62a5ebdd57b3f1238e96b58ba91b7c356e..b35102a3f084e7286df11d25bd6f9c9365778d53 100644 (file)
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -242,11 +242,6 @@ static int sdram_initialise(struct udevice *dev, struct udevice *me_dev,
              version >> 24 , (version >> 16) & 0xff,
              (version >> 8) & 0xff, version & 0xff);
 
-#if CONFIG_USBDEBUG
-       /* mrc.bin reconfigures USB, so reinit it to have debug */
-       early_usbdebug_init();
-#endif
-
        return 0;
 }
 

diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index c5441aafea81f6611822c794ca92253166477d99..33e5c6263d475e8a6a12019d90e07698aa6a499a 100644 (file)
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -393,10 +393,6 @@ static void configure_mca(void)
                msr_write(IA32_MC0_STATUS + (i * 4), msr);
 }
 
-#if CONFIG_USBDEBUG
-static unsigned ehci_debug_addr;
-#endif
-
 static int model_206ax_init(struct udevice *dev)
 {
        int ret;
@@ -404,17 +400,6 @@ static int model_206ax_init(struct udevice *dev)
        /* Clear out pending MCEs */
        configure_mca();
 
-#if CONFIG_USBDEBUG
-       /* Is this caution really needed? */
-       if (!ehci_debug_addr)
-               ehci_debug_addr = get_ehci_debug();
-       set_ehci_debug(0);
-#endif
-
-#if CONFIG_USBDEBUG
-       set_ehci_debug(ehci_debug_addr);
-#endif
-
        /* Enable the local cpu apics */
        enable_lapic_tpr();
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e99ba6b85ab8835090af98ac0a1bf235a6525d44..1a5433759409c1f9ce7c759a7bea3fe40a46a257 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4581,7 +4581,6 @@ CONFIG_USART1
 CONFIG_USART_BASE
 CONFIG_USART_ID
 CONFIG_USBBOOTCOMMAND
-CONFIG_USBDEBUG
 CONFIG_USBD_CONFIGURATION_STR
 CONFIG_USBD_CTRL_INTERFACE_STR
 CONFIG_USBD_DATA_INTERFACE_STR