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

diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index bdf3b1bc6ace65ab98f40b908ffb9c3aeab0dde2..8053fc1333608ba97f4185890c1f287fb27bf31f 100644 (file)
--- 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 b9d6f6925398307c45e70b39277e62ca6d48dbb7..a2e3cdddbfb1803aac146a212156249357c9abde 100644 (file)
--- 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 f5fa880b66733b1af5753dec80ac0091df8a11c7..4af63819e7ce1f20d8e9e617d0a0222bfcd12274 100644 (file)
--- 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 20770e7a119b8863ee1d472dd8a5f4cf5844e6dc..8e95ca4353c37e6d40462bccb7e87b4b181cd108 100644 (file)
--- 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 81978988471f79293c6287199065ad0ab9edc54a..0452ce711890bc39a2ab99fbdb88c498772fcde8 100644 (file)
--- 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 873c6e94791ac57bbf43c4177d03767bcb2dd8bf..61f8353c0e51843bae1df66f7d9b88da0d62f405 100644 (file)
--- 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 79164beae79296ca59a9c6019ae2f0a44e685083..af1e23f5a7eb3bdbaeba471e28a60dab2232a1bc 100644 (file)
--- 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 f8a4a77de26b6423e801869b77c93b73e89f0a96..b7498e99b080878cccd746d9346f0062eda28a0a 100644 (file)
--- 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 623b0a30a1cd0e5d12d301419e566da7dfca3a93..18482c92701a613fa5193e07e533cf0cbaa8e432 100644 (file)
--- 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 91cde9350e833c46324a98ea05db56a2a14ccddf..4af6d844fafe4c9e9fc98a12d72ef7543d84164d 100644 (file)
--- 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 0717116d0ab499780571196627ab075a2b2f83d5..d5e38d8bd45d98e9a165e25c8af4b25490d0e8cf 100644 (file)
--- 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 3d2ca619bacc2ddbd6f57e96f902c18c2c351c89..62b30da75be8c1faff26d64c366670e61e815593 100644 (file)
--- 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 6d32de9e37da43ebd0ba1f191e913b1b4cf101b5..76b434c96b219cdd1998673557162284690281ae 100644 (file)
--- 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 7082bd94a679ffb8fa643b36dc4bc13e76be0a28..c3a0b767133bb9197359badab428ef0c98b74649 100644 (file)
--- 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 e42a3124004ef62ecea0240683026f9406b77d08..a7a4dbdfaae80079be74630ab48106f9d2892c17 100644 (file)
--- 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 2eda2089c38fb03d304a741eab84c8c181c09058..5162000b0550cdb768907d740a182cd5ca8696a6 100644 (file)
--- 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 8429286bc754ca44b58912ca518418e14275ddcf..61ca908248dfc405399ee7feab4128306564b6dd 100644 (file)
--- 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 d7a7a3bb4c75599a45bf736904a07fd040157ca8..18c6e9280e4262e4eca034a6af88387b9d07d56d 100644 (file)
--- 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 87f658615b71a8f6021c8103b6f9ce5f1624ed87..6f32fe5f86768ab33a2e2e92aa5d6db62f9dbf11 100644 (file)
--- 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 4ba6a1afeb64e285fd367464eeb95fff8dd6622b..30c118e73bbd5e2a6678b60bba966a0012037291 100644 (file)
--- 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 246d7afc64ff3a0061ee69446f4ffd64a9a8e0f5..229e9bc397164e1cccdeeac9129580260f098108 100644 (file)
--- 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 1b827a0dc9533c8945808c38c709c81304f54261..ee2118e59ce85e69af4b912037cec93000b4fba0 100644 (file)
--- 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 7bbd01c6837713836670ebdc92aecc3154f24cf5..499735cfb9ddb5f9c2817d6813e7d8dbbf88de9c 100644 (file)
--- 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 1c2a729d4a3deeb77e6f4de128e7bdc9434caeae..9d00a8d92ae1fc4e590e9ab2b9093a4e8f61bfd4 100644 (file)
--- 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 cad5252c77772fbda5ae2621d01bc7f384a33b02..2e7b5aa9701b244bd64dbfc0feebe183e718ce93 100644 (file)
--- 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 572015bf8cbbb3b5614446397555ffb52807fe79..001173657a5a19edaa6ef87d6a3bd8637f50e907 100644 (file)
--- 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 693251922c468f4cae0e713c9070bfa6a31feeca..eb9df6623c223814584f78c84a133dae2cc48ab3 100644 (file)
--- 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 41a4a6ee8d58ff5db2c66ce4520c628bc6b517c5..1dff14236987ad3ec217d2d1cf6e5498086406ca 100644 (file)
--- 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 cb2a2e0d4e6b15d176d0b0f3abd2c9387d186a2f..822474bcf953228286b8383b91ed08b95d8a2706 100644 (file)
--- 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 27d51aba250171ccdc2adc18d1e5221d908757da..05beb124f748e845ff14c9a7fe0052930ca6d2cf 100644 (file)
--- 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 3b5e5f562b3501ca5df038d1a8312688d54e707f..942f2309d63ddab47181b2361a1909af6e9df4e8 100644 (file)
--- 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 3b0879820920dc60de85abc5756812d33b3a5d9d..e1bcf0f723c41c442cdfe214b619e64ee264a5ba 100644 (file)
--- 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 530518c8e2bc8071454ea00c676c0cd2f1aef8a6..fb9033b3ccb38ad1cf76d8634ac7bcbc5e3c6d86 100644 (file)
--- 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 cf603848adeae6f56f7b33fc94ef1470e63ddc9f..fbb011178f7068ee347c430fca232373b71d5914 100644 (file)
--- 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 9d0fa15a57eb70de8e19033c5bd197681a71425e..5522c33412fa0b5bde5c5ca4fdf53e3d356846cc 100644 (file)
--- 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;