also rename the config option.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5588 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

35 files changed, 66 insertions, 66 deletions

diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index bdf3b1bc6a..8053fc1333 100644
--- a/src/arch/i386/boot/coreboot_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -146,7 +146,7 @@ static void lb_console(struct lb_header *header)
 #if CONFIG_CONSOLE_SROM
 	add_console(header, LB_TAG_CONSOLE_SROM);
 #endif
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	add_console(header, LB_TAG_CONSOLE_EHCI);
 #endif
 }
diff --git a/src/console/Kconfig b/src/console/Kconfig
index b9d6f69253..a2e3cdddbf 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -86,7 +86,7 @@ config TTYS0_LCS
 	depends on CONSOLE_SERIAL8250
 
 # TODO: FIX DEPENDENCY HERE
-config USBDEBUG_DIRECT
+config USBDEBUG
 	bool "USB 2.0 EHCI debug dongle support"
 	default n
 	help
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index f5fa880b66..4af63819e7 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -10,7 +10,7 @@ initobj-y += vtxprintf.o
 initobj-$(CONFIG_USE_DCACHE_RAM) += console.o
 
 driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o
-driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_console.o
+driver-$(CONFIG_USBDEBUG) += usbdebug_console.o
 driver-$(CONFIG_CONSOLE_VGA) += vga_console.o
 driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o
 driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o
diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c
index 20770e7a11..8e95ca4353 100644
--- a/src/cpu/amd/model_fxx/model_fxx_init.c
+++ b/src/cpu/amd/model_fxx/model_fxx_init.c
@@ -462,7 +462,7 @@ static inline void k8_errata(void)
 
 }
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 static unsigned ehci_debug_addr;
 #endif
 
@@ -481,7 +481,7 @@ static void model_fxx_init(device_t dev)
 	get_fms(&c, dev->device);
 #endif
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	if (!ehci_debug_addr)
 		ehci_debug_addr = get_ehci_debug();
 	set_ehci_debug(0);
@@ -492,7 +492,7 @@ static void model_fxx_init(device_t dev)
 	amd_setup_mtrrs();
 	x86_mtrr_check();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	set_ehci_debug(ehci_debug_addr);
 #endif
 
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 8197898847..0452ce7118 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -194,7 +194,7 @@ static void configure_pic_thermal_sensors(void)
 	wrmsr(PIC_SENS_CFG, msr);
 }
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 static unsigned ehci_debug_addr;
 #endif
 
@@ -212,7 +212,7 @@ static void model_1067x_init(device_t cpu)
 	fill_processor_name(processor_name);
 	printk(BIOS_INFO, "CPU: %s.\n", processor_name);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	// Is this caution really needed?
 	if(!ehci_debug_addr)
 		ehci_debug_addr = get_ehci_debug();
@@ -223,7 +223,7 @@ static void model_1067x_init(device_t cpu)
 	x86_setup_mtrrs(36);
 	x86_mtrr_check();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	set_ehci_debug(ehci_debug_addr);
 #endif
 
diff --git a/src/cpu/intel/model_106cx/cache_as_ram.inc b/src/cpu/intel/model_106cx/cache_as_ram.inc
index 873c6e9479..61f8353c0e 100644
--- a/src/cpu/intel/model_106cx/cache_as_ram.inc
+++ b/src/cpu/intel/model_106cx/cache_as_ram.inc
@@ -123,7 +123,7 @@ clear_mtrrs:
 	movl	%eax, %cr0
 
 	/* Set up stack pointer */
-#if defined(CONFIG_USBDEBUG_DIRECT) && (CONFIG_USBDEBUG_DIRECT == 1)
+#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
 	/* leave some space for the struct ehci_debug_info */
 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax
 #else
diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c
index 79164beae7..af1e23f5a7 100644
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@@ -155,7 +155,7 @@ static void configure_misc(void)
 	wrmsr(IA32_MISC_ENABLE, msr);
 }
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 static unsigned ehci_debug_addr;
 #endif
 
@@ -173,7 +173,7 @@ static void model_106cx_init(device_t cpu)
 	fill_processor_name(processor_name);
 	printk(BIOS_INFO, "CPU: %s.\n", processor_name);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	// Is this caution really needed?
 	if(!ehci_debug_addr)
 		ehci_debug_addr = get_ehci_debug();
@@ -184,7 +184,7 @@ static void model_106cx_init(device_t cpu)
 	x86_setup_mtrrs(32);
 	x86_mtrr_check();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	set_ehci_debug(ehci_debug_addr);
 #endif
 
diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c
index f8a4a77de2..b7498e99b0 100644
--- a/src/cpu/intel/model_6bx/model_6bx_init.c
+++ b/src/cpu/intel/model_6bx/model_6bx_init.c
@@ -76,7 +76,7 @@ static void fill_processor_name(char *processor_name)
 	strcpy(processor_name, processor_name_start);
 }
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 static unsigned ehci_debug_addr;
 #endif
 
@@ -94,7 +94,7 @@ static void model_6bx_init(device_t cpu)
 	fill_processor_name(processor_name);
 	printk(BIOS_INFO, "CPU: %s.\n", processor_name);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	// Is this caution really needed?
 	if(!ehci_debug_addr)
 		ehci_debug_addr = get_ehci_debug();
@@ -105,7 +105,7 @@ static void model_6bx_init(device_t cpu)
 	x86_setup_mtrrs(36);
 	x86_mtrr_check();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	set_ehci_debug(ehci_debug_addr);
 #endif
 
diff --git a/src/cpu/intel/model_6ex/cache_as_ram.inc b/src/cpu/intel/model_6ex/cache_as_ram.inc
index 623b0a30a1..18482c9270 100644
--- a/src/cpu/intel/model_6ex/cache_as_ram.inc
+++ b/src/cpu/intel/model_6ex/cache_as_ram.inc
@@ -123,7 +123,7 @@ clear_mtrrs:
 	movl	%eax, %cr0
 
 	/* Set up stack pointer */
-#if defined(CONFIG_USBDEBUG_DIRECT) && (CONFIG_USBDEBUG_DIRECT == 1)
+#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
 	/* leave some space for the struct ehci_debug_info */
 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax
 #else
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index 91cde9350e..4af6d844fa 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -184,7 +184,7 @@ static void configure_pic_thermal_sensors(void)
 	wrmsr(PIC_SENS_CFG, msr);
 }
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 static unsigned ehci_debug_addr;
 #endif
 
@@ -202,7 +202,7 @@ static void model_6ex_init(device_t cpu)
 	fill_processor_name(processor_name);
 	printk(BIOS_INFO, "CPU: %s.\n", processor_name);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	// Is this caution really needed?
 	if(!ehci_debug_addr)
 		ehci_debug_addr = get_ehci_debug();
@@ -213,7 +213,7 @@ static void model_6ex_init(device_t cpu)
 	x86_setup_mtrrs(36);
 	x86_mtrr_check();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	set_ehci_debug(ehci_debug_addr);
 #endif
 
diff --git a/src/cpu/intel/model_6fx/cache_as_ram.inc b/src/cpu/intel/model_6fx/cache_as_ram.inc
index 0717116d0a..d5e38d8bd4 100644
--- a/src/cpu/intel/model_6fx/cache_as_ram.inc
+++ b/src/cpu/intel/model_6fx/cache_as_ram.inc
@@ -130,7 +130,7 @@ clear_mtrrs:
 	movl	%eax, %cr0
 
 	/* Set up stack pointer */
-#if defined(CONFIG_USBDEBUG_DIRECT) && (CONFIG_USBDEBUG_DIRECT == 1)
+#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
 	/* leave some space for the struct ehci_debug_info */
 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax
 #else
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
index 3d2ca619ba..62b30da75b 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -211,7 +211,7 @@ static void configure_pic_thermal_sensors(void)
 	wrmsr(PIC_SENS_CFG, msr);
 }
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 static unsigned ehci_debug_addr;
 #endif
 
@@ -229,7 +229,7 @@ static void model_6fx_init(device_t cpu)
 	fill_processor_name(processor_name);
 	printk(BIOS_INFO, "CPU: %s.\n", processor_name);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	// Is this caution really needed?
 	if(!ehci_debug_addr)
 		ehci_debug_addr = get_ehci_debug();
@@ -243,7 +243,7 @@ static void model_6fx_init(device_t cpu)
 	/* Setup Page Attribute Tables (PAT) */
 	// TODO set up PAT
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	set_ehci_debug(ehci_debug_addr);
 #endif
 
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 6d32de9e37..76b434c96b 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -23,7 +23,7 @@ initobj-y += cbfs.o
 initobj-y += lzma.o
 #initobj-y += lzmadecode.o
 
-obj-$(CONFIG_USBDEBUG_DIRECT) += usbdebug.o
+obj-$(CONFIG_USBDEBUG) += usbdebug.o
 
 obj-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.o
 
diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index 7082bd94a6..c3a0b76713 100644
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -37,7 +37,7 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #define DBGP_DEFAULT 0
 #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
 #include "pc80/usbdebug_serial.c"
@@ -320,7 +320,7 @@ void main(unsigned long bist)
 	/* Set up the console */
 	uart_init();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	i82801gx_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
index e42a312400..a7a4dbdfaa 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
@@ -83,7 +83,7 @@ void hardwaremain(int ret_addr)
 
 	id = get_node_core_id_x();
 
-	//FIXME: for USBDEBUG_DIRECT you need to make sure dbg_info get assigned in AP
+	//FIXME: for USBDEBUG you need to make sure dbg_info get assigned in AP
         print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n");
 
 	train_ram(id.nodeid, sysinfo, sysinfox);
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
index 2eda2089c3..5162000b05 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
@@ -54,7 +54,7 @@
 #include "pc80/mc146818rtc_early.c"
 
 #include <console/console.h>
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include "southbridge/sis/sis966/sis966_enable_usbdebug.c"
 #include "pc80/usbdebug_serial.c"
 #endif
@@ -199,7 +199,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	sis966_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/gigabyte/m57sli/ap_romstage.c b/src/mainboard/gigabyte/m57sli/ap_romstage.c
index 8429286bc7..61ca908248 100644
--- a/src/mainboard/gigabyte/m57sli/ap_romstage.c
+++ b/src/mainboard/gigabyte/m57sli/ap_romstage.c
@@ -81,7 +81,7 @@ void hardwaremain(int ret_addr)
 
 	id = get_node_core_id_x();
 
-	//FIXME: for USBDEBUG_DIRECT you need to make sure dbg_info get assigned in AP
+	//FIXME: for USBDEBUG you need to make sure dbg_info get assigned in AP
         print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n");
 
 	train_ram(id.nodeid, sysinfo, sysinfox);
diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c
index d7a7a3bb4c..18c6e9280e 100644
--- a/src/mainboard/gigabyte/m57sli/romstage.c
+++ b/src/mainboard/gigabyte/m57sli/romstage.c
@@ -52,7 +52,7 @@
 #include "pc80/mc146818rtc_early.c"
 
 #include <console/console.h>
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
 #include "pc80/usbdebug_serial.c"
 #endif
@@ -212,7 +212,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	mcp55_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c
index 87f658615b..6f32fe5f86 100644
--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@@ -39,7 +39,7 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #define DBGP_DEFAULT 1
 #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
 #include "pc80/usbdebug_serial.c"
@@ -236,7 +236,7 @@ void main(unsigned long bist)
 	/* Set up the console */
 	uart_init();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	i82801gx_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c
index 4ba6a1afeb..30c118e73b 100644
--- a/src/mainboard/kontron/986lcd-m/romstage.c
+++ b/src/mainboard/kontron/986lcd-m/romstage.c
@@ -48,7 +48,7 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #define DBGP_DEFAULT 1
 #include <usbdebug.h>
 #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
@@ -380,7 +380,7 @@ void main(unsigned long bist)
 	/* Set up the console */
 	uart_init();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	i82801gx_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/msi/ms7260/ap_romstage.c b/src/mainboard/msi/ms7260/ap_romstage.c
index 246d7afc64..229e9bc397 100644
--- a/src/mainboard/msi/ms7260/ap_romstage.c
+++ b/src/mainboard/msi/ms7260/ap_romstage.c
@@ -67,7 +67,7 @@ void hardwaremain(int ret_addr)
 
 	id = get_node_core_id_x();
 
-	/* FIXME: For USBDEBUG_DIRECT you need to make sure dbg_info gets
+	/* FIXME: For USBDEBUG you need to make sure dbg_info gets
 	 * assigned in AP.
 	 */
 	print_debug("CODE IN CACHE ON NODE:");
diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c
index 1b827a0dc9..ee2118e59c 100644
--- a/src/mainboard/msi/ms7260/romstage.c
+++ b/src/mainboard/msi/ms7260/romstage.c
@@ -56,7 +56,7 @@
 #include "pc80/mc146818rtc_early.c"
 
 #include <console/console.h>
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
 #include "pc80/usbdebug_serial.c"
 #endif
@@ -181,7 +181,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	setup_mb_resource_map();
 	uart_init();
 	report_bist_failure(bist); /* Halt upon BIST failure. */
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	mcp55_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 7bbd01c683..499735cfb9 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -159,7 +159,7 @@ config PCI_ROM_RUN
 	default y
 	depends on BOARD_MSI_MS9652_FAM10
 
-config USBDEBUG_DIRECT
+config USBDEBUG
 	bool
 	default n
 	depends on BOARD_MSI_MS9652_FAM10
diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index 1c2a729d4a..9d00a8d92a 100644
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -45,7 +45,7 @@
 #include <cpu/x86/lapic.h>
 #include "option_table.h"
 #include <console/console.h>
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
 #include "pc80/usbdebug_serial.c"
 #endif
@@ -185,7 +185,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	mcp55_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/nvidia/l1_2pvv/ap_romstage.c b/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
index cad5252c77..2e7b5aa970 100644
--- a/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
@@ -81,7 +81,7 @@ void hardwaremain(int ret_addr)
 
 	id = get_node_core_id_x();
 
-	//FIXME: for USBDEBUG_DIRECT you need to make sure dbg_info get assigned in AP
+	//FIXME: for USBDEBUG you need to make sure dbg_info get assigned in AP
 	print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n");
 
 	train_ram(id.nodeid, sysinfo, sysinfox);
diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c
index 572015bf8c..001173657a 100644
--- a/src/mainboard/nvidia/l1_2pvv/romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/romstage.c
@@ -52,7 +52,7 @@
 #include "pc80/mc146818rtc_early.c"
 
 #include <console/console.h>
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
 #include "pc80/usbdebug_serial.c"
 #endif
@@ -198,7 +198,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	mcp55_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index 693251922c..eb9df6623c 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -41,7 +41,7 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #define DBGP_DEFAULT 1
 #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
 #include "pc80/usbdebug_serial.c"
@@ -290,7 +290,7 @@ void main(unsigned long bist)
 	/* Set up the console */
 	uart_init();
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	i82801gx_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/tyan/s2912/ap_romstage.c b/src/mainboard/tyan/s2912/ap_romstage.c
index 41a4a6ee8d..1dff142369 100644
--- a/src/mainboard/tyan/s2912/ap_romstage.c
+++ b/src/mainboard/tyan/s2912/ap_romstage.c
@@ -78,7 +78,7 @@ void hardwaremain(int ret_addr)
 
 	id = get_node_core_id_x();
 
-	//FIXME: for USBDEBUG_DIRECT you need to make sure dbg_info get assigned in AP
+	//FIXME: for USBDEBUG you need to make sure dbg_info get assigned in AP
 	print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n");
 
 	train_ram(id.nodeid, sysinfo, sysinfox);
diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c
index cb2a2e0d4e..822474bcf9 100644
--- a/src/mainboard/tyan/s2912/romstage.c
+++ b/src/mainboard/tyan/s2912/romstage.c
@@ -52,7 +52,7 @@
 #include "pc80/mc146818rtc_early.c"
 
 #include <console/console.h>
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
 #include "pc80/usbdebug_serial.c"
 #endif
@@ -192,7 +192,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	mcp55_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index 27d51aba25..05beb124f7 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -45,7 +45,7 @@
 #include <cpu/x86/lapic.h>
 #include "option_table.h"
 #include <console/console.h>
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
 #include "pc80/usbdebug_serial.c"
 #endif
@@ -180,7 +180,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	mcp55_enable_usbdebug(DBGP_DEFAULT);
 	early_usbdebug_init();
 #endif
diff --git a/src/southbridge/amd/sb600/sb600_usb.c b/src/southbridge/amd/sb600/sb600_usb.c
index 3b5e5f562b..942f2309d6 100644
--- a/src/southbridge/amd/sb600/sb600_usb.c
+++ b/src/southbridge/amd/sb600/sb600_usb.c
@@ -127,7 +127,7 @@ static void usb_init2(struct device *dev)
 
 static void usb_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	u32 base;
 	u32 old_debug;
@@ -137,7 +137,7 @@ static void usb_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(old_debug);
 	if (!res)
diff --git a/src/southbridge/amd/sb700/sb700_usb.c b/src/southbridge/amd/sb700/sb700_usb.c
index 3b08798209..e1bcf0f723 100644
--- a/src/southbridge/amd/sb700/sb700_usb.c
+++ b/src/southbridge/amd/sb700/sb700_usb.c
@@ -169,7 +169,7 @@ static void usb_init2(struct device *dev)
 
 static void usb_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	u32 base;
 	u32 old_debug;
@@ -179,7 +179,7 @@ static void usb_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(old_debug);
 	if (!res)
diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
index 530518c8e2..fb9033b3cc 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
@@ -23,7 +23,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include "i82801gx.h"
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include <usbdebug.h>
 #endif
 #include <arch/io.h>
@@ -87,7 +87,7 @@ static void usb_ehci_set_subsystem(device_t dev, unsigned vendor, unsigned devic
 
 static void usb_ehci_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	u32 base;
 	u32 usb_debug;
@@ -97,7 +97,7 @@ static void usb_ehci_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(usb_debug);
 	if (!res) return;
diff --git a/src/southbridge/nvidia/mcp55/mcp55_usb2.c b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
index cf603848ad..fbb011178f 100644
--- a/src/southbridge/nvidia/mcp55/mcp55_usb2.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
@@ -27,7 +27,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include "mcp55.h"
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include <usbdebug.h>
 #endif
 
@@ -43,7 +43,7 @@ static void usb2_init(struct device *dev)
 
 static void usb2_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	unsigned base;
 	unsigned old_debug;
@@ -53,7 +53,7 @@ static void usb2_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(old_debug);
 	if (!res) return;
diff --git a/src/southbridge/sis/sis966/sis966_usb2.c b/src/southbridge/sis/sis966/sis966_usb2.c
index 9d0fa15a57..5522c33412 100644
--- a/src/southbridge/sis/sis966/sis966_usb2.c
+++ b/src/southbridge/sis/sis966/sis966_usb2.c
@@ -30,7 +30,7 @@
 #include <device/pci_ops.h>
 #include <arch/io.h>
 #include "sis966.h"
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include <usbdebug.h>
 #endif
 
@@ -123,7 +123,7 @@ static void usb2_init(struct device *dev)
 
 static void usb2_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	unsigned base;
 	unsigned old_debug;
@@ -133,7 +133,7 @@ static void usb2_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(old_debug);
 	if (!res) return;