Author: stepan Date: Tue May 25 19:09:05 2010 New Revision: 5588 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5588
Log: also rename the config option. Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/src/arch/i386/boot/coreboot_table.c trunk/src/console/Kconfig trunk/src/console/Makefile.inc trunk/src/cpu/amd/model_fxx/model_fxx_init.c trunk/src/cpu/intel/model_1067x/model_1067x_init.c trunk/src/cpu/intel/model_106cx/cache_as_ram.inc trunk/src/cpu/intel/model_106cx/model_106cx_init.c trunk/src/cpu/intel/model_6bx/model_6bx_init.c trunk/src/cpu/intel/model_6ex/cache_as_ram.inc trunk/src/cpu/intel/model_6ex/model_6ex_init.c trunk/src/cpu/intel/model_6fx/cache_as_ram.inc trunk/src/cpu/intel/model_6fx/model_6fx_init.c trunk/src/lib/Makefile.inc trunk/src/mainboard/getac/p470/romstage.c trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c trunk/src/mainboard/gigabyte/m57sli/romstage.c trunk/src/mainboard/intel/d945gclf/romstage.c trunk/src/mainboard/kontron/986lcd-m/romstage.c trunk/src/mainboard/msi/ms7260/ap_romstage.c trunk/src/mainboard/msi/ms7260/romstage.c trunk/src/mainboard/msi/ms9652_fam10/Kconfig trunk/src/mainboard/msi/ms9652_fam10/romstage.c trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c trunk/src/mainboard/nvidia/l1_2pvv/romstage.c trunk/src/mainboard/roda/rk886ex/romstage.c trunk/src/mainboard/tyan/s2912/ap_romstage.c trunk/src/mainboard/tyan/s2912/romstage.c trunk/src/mainboard/tyan/s2912_fam10/romstage.c trunk/src/southbridge/amd/sb600/sb600_usb.c trunk/src/southbridge/amd/sb700/sb700_usb.c trunk/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c trunk/src/southbridge/nvidia/mcp55/mcp55_usb2.c trunk/src/southbridge/sis/sis966/sis966_usb2.c
Modified: trunk/src/arch/i386/boot/coreboot_table.c ============================================================================== --- trunk/src/arch/i386/boot/coreboot_table.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/arch/i386/boot/coreboot_table.c Tue May 25 19:09:05 2010 (r5588) @@ -146,7 +146,7 @@ #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 }
Modified: trunk/src/console/Kconfig ============================================================================== --- trunk/src/console/Kconfig Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/console/Kconfig Tue May 25 19:09:05 2010 (r5588) @@ -86,7 +86,7 @@ depends on CONSOLE_SERIAL8250
# TODO: FIX DEPENDENCY HERE -config USBDEBUG_DIRECT +config USBDEBUG bool "USB 2.0 EHCI debug dongle support" default n help
Modified: trunk/src/console/Makefile.inc ============================================================================== --- trunk/src/console/Makefile.inc Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/console/Makefile.inc Tue May 25 19:09:05 2010 (r5588) @@ -10,7 +10,7 @@ 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
Modified: trunk/src/cpu/amd/model_fxx/model_fxx_init.c ============================================================================== --- trunk/src/cpu/amd/model_fxx/model_fxx_init.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/amd/model_fxx/model_fxx_init.c Tue May 25 19:09:05 2010 (r5588) @@ -462,7 +462,7 @@
}
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif
@@ -481,7 +481,7 @@ 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 @@ amd_setup_mtrrs(); x86_mtrr_check();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG set_ehci_debug(ehci_debug_addr); #endif
Modified: trunk/src/cpu/intel/model_1067x/model_1067x_init.c ============================================================================== --- trunk/src/cpu/intel/model_1067x/model_1067x_init.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/intel/model_1067x/model_1067x_init.c Tue May 25 19:09:05 2010 (r5588) @@ -194,7 +194,7 @@ wrmsr(PIC_SENS_CFG, msr); }
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif
@@ -212,7 +212,7 @@ 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 @@ x86_setup_mtrrs(36); x86_mtrr_check();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG set_ehci_debug(ehci_debug_addr); #endif
Modified: trunk/src/cpu/intel/model_106cx/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/intel/model_106cx/cache_as_ram.inc Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/intel/model_106cx/cache_as_ram.inc Tue May 25 19:09:05 2010 (r5588) @@ -123,7 +123,7 @@ 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
Modified: trunk/src/cpu/intel/model_106cx/model_106cx_init.c ============================================================================== --- trunk/src/cpu/intel/model_106cx/model_106cx_init.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/intel/model_106cx/model_106cx_init.c Tue May 25 19:09:05 2010 (r5588) @@ -155,7 +155,7 @@ wrmsr(IA32_MISC_ENABLE, msr); }
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif
@@ -173,7 +173,7 @@ 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 @@ x86_setup_mtrrs(32); x86_mtrr_check();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG set_ehci_debug(ehci_debug_addr); #endif
Modified: trunk/src/cpu/intel/model_6bx/model_6bx_init.c ============================================================================== --- trunk/src/cpu/intel/model_6bx/model_6bx_init.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/intel/model_6bx/model_6bx_init.c Tue May 25 19:09:05 2010 (r5588) @@ -76,7 +76,7 @@ strcpy(processor_name, processor_name_start); }
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif
@@ -94,7 +94,7 @@ 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 @@ x86_setup_mtrrs(36); x86_mtrr_check();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG set_ehci_debug(ehci_debug_addr); #endif
Modified: trunk/src/cpu/intel/model_6ex/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/intel/model_6ex/cache_as_ram.inc Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/intel/model_6ex/cache_as_ram.inc Tue May 25 19:09:05 2010 (r5588) @@ -123,7 +123,7 @@ 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
Modified: trunk/src/cpu/intel/model_6ex/model_6ex_init.c ============================================================================== --- trunk/src/cpu/intel/model_6ex/model_6ex_init.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/intel/model_6ex/model_6ex_init.c Tue May 25 19:09:05 2010 (r5588) @@ -184,7 +184,7 @@ wrmsr(PIC_SENS_CFG, msr); }
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif
@@ -202,7 +202,7 @@ 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 @@ x86_setup_mtrrs(36); x86_mtrr_check();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG set_ehci_debug(ehci_debug_addr); #endif
Modified: trunk/src/cpu/intel/model_6fx/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/intel/model_6fx/cache_as_ram.inc Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/intel/model_6fx/cache_as_ram.inc Tue May 25 19:09:05 2010 (r5588) @@ -130,7 +130,7 @@ 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
Modified: trunk/src/cpu/intel/model_6fx/model_6fx_init.c ============================================================================== --- trunk/src/cpu/intel/model_6fx/model_6fx_init.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/cpu/intel/model_6fx/model_6fx_init.c Tue May 25 19:09:05 2010 (r5588) @@ -211,7 +211,7 @@ wrmsr(PIC_SENS_CFG, msr); }
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif
@@ -229,7 +229,7 @@ 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 @@ /* Setup Page Attribute Tables (PAT) */ // TODO set up PAT
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG set_ehci_debug(ehci_debug_addr); #endif
Modified: trunk/src/lib/Makefile.inc ============================================================================== --- trunk/src/lib/Makefile.inc Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/lib/Makefile.inc Tue May 25 19:09:05 2010 (r5588) @@ -23,7 +23,7 @@ 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
Modified: trunk/src/mainboard/getac/p470/romstage.c ============================================================================== --- trunk/src/mainboard/getac/p470/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/getac/p470/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG i82801gx_enable_usbdebug(DBGP_DEFAULT); early_usbdebug_init(); #endif
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -83,7 +83,7 @@
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);
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* 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
Modified: trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -81,7 +81,7 @@
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);
Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/gigabyte/m57sli/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* 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
Modified: trunk/src/mainboard/intel/d945gclf/romstage.c ============================================================================== --- trunk/src/mainboard/intel/d945gclf/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/intel/d945gclf/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG i82801gx_enable_usbdebug(DBGP_DEFAULT); early_usbdebug_init(); #endif
Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG i82801gx_enable_usbdebug(DBGP_DEFAULT); early_usbdebug_init(); #endif
Modified: trunk/src/mainboard/msi/ms7260/ap_romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/ap_romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/msi/ms7260/ap_romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -67,7 +67,7 @@
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:");
Modified: trunk/src/mainboard/msi/ms7260/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/msi/ms7260/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ 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
Modified: trunk/src/mainboard/msi/ms9652_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/Kconfig Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/msi/ms9652_fam10/Kconfig Tue May 25 19:09:05 2010 (r5588) @@ -159,7 +159,7 @@ default y depends on BOARD_MSI_MS9652_FAM10
-config USBDEBUG_DIRECT +config USBDEBUG bool default n depends on BOARD_MSI_MS9652_FAM10
Modified: trunk/src/mainboard/msi/ms9652_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/msi/ms9652_fam10/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* 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
Modified: trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -81,7 +81,7 @@
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);
Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* 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
Modified: trunk/src/mainboard/roda/rk886ex/romstage.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/roda/rk886ex/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG i82801gx_enable_usbdebug(DBGP_DEFAULT); early_usbdebug_init(); #endif
Modified: trunk/src/mainboard/tyan/s2912/ap_romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/ap_romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/tyan/s2912/ap_romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -78,7 +78,7 @@
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);
Modified: trunk/src/mainboard/tyan/s2912/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/tyan/s2912/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* 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
Modified: trunk/src/mainboard/tyan/s2912_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/romstage.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/mainboard/tyan/s2912_fam10/romstage.c Tue May 25 19:09:05 2010 (r5588) @@ -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 @@ /* 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
Modified: trunk/src/southbridge/amd/sb600/sb600_usb.c ============================================================================== --- trunk/src/southbridge/amd/sb600/sb600_usb.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/southbridge/amd/sb600/sb600_usb.c Tue May 25 19:09:05 2010 (r5588) @@ -127,7 +127,7 @@
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 @@ #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)
Modified: trunk/src/southbridge/amd/sb700/sb700_usb.c ============================================================================== --- trunk/src/southbridge/amd/sb700/sb700_usb.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/southbridge/amd/sb700/sb700_usb.c Tue May 25 19:09:05 2010 (r5588) @@ -169,7 +169,7 @@
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 @@ #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)
Modified: trunk/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c ============================================================================== --- trunk/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c Tue May 25 19:09:05 2010 (r5588) @@ -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_resources(struct device *dev) { -#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG struct resource *res; u32 base; u32 usb_debug; @@ -97,7 +97,7 @@ #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;
Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_usb2.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_usb2.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_usb2.c Tue May 25 19:09:05 2010 (r5588) @@ -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_set_resources(struct device *dev) { -#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG struct resource *res; unsigned base; unsigned old_debug; @@ -53,7 +53,7 @@ #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;
Modified: trunk/src/southbridge/sis/sis966/sis966_usb2.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_usb2.c Tue May 25 18:35:51 2010 (r5587) +++ trunk/src/southbridge/sis/sis966/sis966_usb2.c Tue May 25 19:09:05 2010 (r5588) @@ -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_set_resources(struct device *dev) { -#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG struct resource *res; unsigned base; unsigned old_debug; @@ -133,7 +133,7 @@ #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;