diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2018-06-03 19:04:19 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2018-06-13 09:50:57 +0800 |
| commit | a8542ad81f544e754a7173b43b13f9db1354de0f (patch) | |
| tree | 3e325567f217f3540c2a8b20fa5761f13544ed8b | |
| parent | 7d0bc172e5a5621113710d5e6e1a5413845c0863 (diff) | |
| download | u-boot-a8542ad81f544e754a7173b43b13f9db1354de0f.tar.gz | |
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>
| -rw-r--r-- | arch/x86/cpu/intel_common/mrc.c | 5 | ||||
| -rw-r--r-- | arch/x86/cpu/ivybridge/model_206ax.c | 15 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index a5697a62a5..b35102a3f0 100644 --- 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 c5441aafea..33e5c6263d 100644 --- 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 e99ba6b85a..1a54337594 100644 --- 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 |