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

9 files changed, 21 insertions, 21 deletions

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