Author: stepan Date: Tue Apr 19 01:51:12 2011 New Revision: 6513 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6513
Log: * Set USBDEBUG_DEFAULT_PORT in all southbridges and use that value to unify calls to *_enable_usbdebug() * rename *_enable_usbdebug() to enable_usbdebug() * move enable_usbdebug() to generic romstage console init code and drop it from the individual romstage.c files.
Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org Acked-by: Peter Stuge peter@stuge.se
Modified: trunk/src/console/console.c trunk/src/mainboard/amd/bimini_fam10/romstage.c trunk/src/mainboard/amd/dbm690t/romstage.c trunk/src/mainboard/amd/mahogany/romstage.c trunk/src/mainboard/amd/mahogany_fam10/romstage.c trunk/src/mainboard/amd/pistachio/romstage.c trunk/src/mainboard/amd/tilapia_fam10/romstage.c trunk/src/mainboard/asrock/939a785gmh/romstage.c trunk/src/mainboard/asus/m2n-e/romstage.c trunk/src/mainboard/asus/m4a78-em/romstage.c trunk/src/mainboard/asus/m4a785-m/romstage.c trunk/src/mainboard/getac/p470/romstage.c trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c trunk/src/mainboard/gigabyte/m57sli/romstage.c trunk/src/mainboard/gigabyte/ma785gmt/romstage.c trunk/src/mainboard/gigabyte/ma78gm/romstage.c trunk/src/mainboard/ibase/mb899/romstage.c trunk/src/mainboard/iei/kino-780am2-fam10/romstage.c trunk/src/mainboard/intel/d945gclf/romstage.c trunk/src/mainboard/jetway/pa78vm5/romstage.c trunk/src/mainboard/kontron/986lcd-m/romstage.c trunk/src/mainboard/kontron/kt690/romstage.c trunk/src/mainboard/lenovo/x60/romstage.c trunk/src/mainboard/msi/ms7260/romstage.c trunk/src/mainboard/msi/ms9652_fam10/romstage.c trunk/src/mainboard/nvidia/l1_2pvv/romstage.c trunk/src/mainboard/roda/rk886ex/romstage.c trunk/src/mainboard/supermicro/h8scm_fam10/romstage.c trunk/src/mainboard/technexion/tim5690/romstage.c trunk/src/mainboard/technexion/tim8690/romstage.c trunk/src/mainboard/tyan/s2912/romstage.c trunk/src/mainboard/tyan/s2912_fam10/romstage.c trunk/src/southbridge/amd/sb600/Kconfig trunk/src/southbridge/amd/sb600/enable_usbdebug.c trunk/src/southbridge/amd/sb600/sb600.h trunk/src/southbridge/amd/sb700/enable_usbdebug.c trunk/src/southbridge/amd/sb700/sb700.h trunk/src/southbridge/amd/sb800/enable_usbdebug.c trunk/src/southbridge/amd/sb800/sb800.h trunk/src/southbridge/intel/i82801gx/Kconfig trunk/src/southbridge/intel/i82801gx/i82801gx.h trunk/src/southbridge/intel/i82801gx/usb_debug.c trunk/src/southbridge/intel/sch/usb_debug.c trunk/src/southbridge/nvidia/ck804/ck804.h trunk/src/southbridge/nvidia/ck804/enable_usbdebug.c trunk/src/southbridge/nvidia/mcp55/enable_usbdebug.c trunk/src/southbridge/nvidia/mcp55/mcp55.h trunk/src/southbridge/sis/sis966/enable_usbdebug.c trunk/src/southbridge/sis/sis966/sis966.h
Modified: trunk/src/console/console.c ============================================================================== --- trunk/src/console/console.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/console/console.c Tue Apr 19 01:51:12 2011 (r6513) @@ -95,6 +95,10 @@
void console_init(void) { +#if CONFIG_USBDEBUG + enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); + early_usbdebug_init(); +#endif #if CONFIG_CONSOLE_NE2K ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT); #endif
Modified: trunk/src/mainboard/amd/bimini_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/bimini_fam10/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/amd/bimini_fam10/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -110,12 +110,7 @@ sb800_lpc_init();
uart_init(); -#if CONFIG_USBDEBUG - sb800_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/amd/dbm690t/romstage.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/amd/dbm690t/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -94,11 +94,6 @@ it8712f_enable_serial(0, CONFIG_TTYS0_BASE); uart_init();
-#if CONFIG_USBDEBUG - sb600_enable_usbdebug(0); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/amd/mahogany/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/amd/mahogany/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -93,11 +93,6 @@ it8718f_enable_serial(0, CONFIG_TTYS0_BASE); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/amd/mahogany_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/amd/mahogany_fam10/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -106,13 +106,7 @@ it8718f_enable_serial(0, CONFIG_TTYS0_BASE); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/amd/pistachio/romstage.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/amd/pistachio/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -91,11 +91,6 @@ * and it doesn't require any special setup. */ uart_init();
-#if CONFIG_USBDEBUG - sb600_enable_usbdebug(0); - early_usbdebug_init(); -#endif - console_init();
post_code(0x03);
Modified: trunk/src/mainboard/amd/tilapia_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/tilapia_fam10/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/amd/tilapia_fam10/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -105,13 +105,7 @@ it8718f_enable_serial(0, CONFIG_TTYS0_BASE); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/asrock/939a785gmh/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -160,11 +160,6 @@ w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/asus/m2n-e/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m2n-e/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/asus/m2n-e/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -123,10 +123,6 @@ setup_mb_resource_map(); uart_init(); report_bist_failure(bist); -#if CONFIG_USBDEBUG - mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif console_init();
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo, sysinfo + 1);
Modified: trunk/src/mainboard/asus/m4a78-em/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m4a78-em/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/asus/m4a78-em/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -106,13 +106,7 @@ it8712f_kill_watchdog(); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/asus/m4a785-m/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m4a785-m/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/asus/m4a785-m/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -106,13 +106,7 @@ it8712f_kill_watchdog(); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/getac/p470/romstage.c ============================================================================== --- trunk/src/mainboard/getac/p470/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/getac/p470/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -288,10 +288,6 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG - i82801gx_enable_usbdebug(1); - early_usbdebug_init(); -#endif console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -147,10 +147,6 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
-#if CONFIG_USBDEBUG - sis966_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif console_init(); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/gigabyte/m57sli/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -150,10 +150,6 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
-#if CONFIG_USBDEBUG - mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif console_init(); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
Modified: trunk/src/mainboard/gigabyte/ma785gmt/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ma785gmt/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/gigabyte/ma785gmt/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -102,11 +102,6 @@ it8718f_disable_reboot(); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init(); printk(BIOS_DEBUG, "\n");
Modified: trunk/src/mainboard/gigabyte/ma78gm/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ma78gm/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/gigabyte/ma78gm/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -106,13 +106,7 @@ it8718f_disable_reboot(); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init(); - printk(BIOS_DEBUG, "\n");
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
Modified: trunk/src/mainboard/ibase/mb899/romstage.c ============================================================================== --- trunk/src/mainboard/ibase/mb899/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/ibase/mb899/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -239,11 +239,6 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG - i82801gx_enable_usbdebug(1); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/iei/kino-780am2-fam10/romstage.c ============================================================================== --- trunk/src/mainboard/iei/kino-780am2-fam10/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/iei/kino-780am2-fam10/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -107,13 +107,7 @@ f71859_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/intel/d945gclf/romstage.c ============================================================================== --- trunk/src/mainboard/intel/d945gclf/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/intel/d945gclf/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -200,11 +200,6 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG - i82801gx_enable_usbdebug(1); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/jetway/pa78vm5/romstage.c ============================================================================== --- trunk/src/mainboard/jetway/pa78vm5/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/jetway/pa78vm5/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -112,13 +112,7 @@ f71863fg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -337,11 +337,6 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG - i82801gx_enable_usbdebug(1); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/kontron/kt690/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/kontron/kt690/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -96,11 +96,6 @@ w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); uart_init();
-#if CONFIG_USBDEBUG - sb600_enable_usbdebug(0); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/lenovo/x60/romstage.c ============================================================================== --- trunk/src/mainboard/lenovo/x60/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/lenovo/x60/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -242,11 +242,6 @@ uart_init(); }
-#if CONFIG_USBDEBUG - i82801gx_enable_usbdebug(1); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/msi/ms7260/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/msi/ms7260/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -139,10 +139,6 @@ setup_mb_resource_map(); uart_init(); report_bist_failure(bist); /* Halt upon BIST failure. */ -#if CONFIG_USBDEBUG - mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif console_init();
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
Modified: trunk/src/mainboard/msi/ms9652_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/msi/ms9652_fam10/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -138,16 +138,10 @@ w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); uart_init(); console_init(); - printk(BIOS_DEBUG, "\n");
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
-#if CONFIG_USBDEBUG - mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - val = cpuid_eax(1); printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -140,10 +140,6 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
-#if CONFIG_USBDEBUG - mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif console_init(); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
Modified: trunk/src/mainboard/roda/rk886ex/romstage.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/roda/rk886ex/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -272,11 +272,6 @@ /* Set up the console */ uart_init();
-#if CONFIG_USBDEBUG - i82801gx_enable_usbdebug(1); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/supermicro/h8scm_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8scm_fam10/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/supermicro/h8scm_fam10/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -125,12 +125,7 @@ sb7xx_51xx_disable_wideio(0); uart_init();
-#if CONFIG_USBDEBUG - sb7xx_51xx_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/technexion/tim5690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/technexion/tim5690/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -100,11 +100,6 @@ it8712f_kill_watchdog(); uart_init();
-#if CONFIG_USBDEBUG - sb600_enable_usbdebug(0); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/technexion/tim8690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/technexion/tim8690/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -95,11 +95,6 @@ it8712f_kill_watchdog(); uart_init();
-#if CONFIG_USBDEBUG - sb600_enable_usbdebug(0); - early_usbdebug_init(); -#endif - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2912/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/tyan/s2912/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -136,10 +136,6 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
-#if CONFIG_USBDEBUG - mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif console_init(); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
Modified: trunk/src/mainboard/tyan/s2912_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/romstage.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/mainboard/tyan/s2912_fam10/romstage.c Tue Apr 19 01:51:12 2011 (r6513) @@ -138,16 +138,10 @@ w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); uart_init(); console_init(); - printk(BIOS_DEBUG, "\n");
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
-#if CONFIG_USBDEBUG - mcp55_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); - early_usbdebug_init(); -#endif - val = cpuid_eax(1); printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
Modified: trunk/src/southbridge/amd/sb600/Kconfig ============================================================================== --- trunk/src/southbridge/amd/sb600/Kconfig Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/amd/sb600/Kconfig Tue Apr 19 01:51:12 2011 (r6513) @@ -36,6 +36,10 @@ hex default 0xe0
+config USBDEBUG_DEFAULT_PORT + int + default 0 + choice prompt "SATA Mode" default SATA_MODE_IDE
Modified: trunk/src/southbridge/amd/sb600/enable_usbdebug.c ============================================================================== --- trunk/src/southbridge/amd/sb600/enable_usbdebug.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/amd/sb600/enable_usbdebug.c Tue Apr 19 01:51:12 2011 (r6513) @@ -30,7 +30,7 @@ /* TODO: Allow changing the physical USB port used as Debug Port. */ }
-void sb600_enable_usbdebug(unsigned int port) +void enable_usbdebug(unsigned int port) { device_t dev = PCI_DEV(0, 0x13, 5); /* USB EHCI, D19:F5 */
Modified: trunk/src/southbridge/amd/sb600/sb600.h ============================================================================== --- trunk/src/southbridge/amd/sb600/sb600.h Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/amd/sb600/sb600.h Tue Apr 19 01:51:12 2011 (r6513) @@ -40,5 +40,5 @@ void sb600_lpc_port80(void); void sb600_pci_port80(void);
-void sb600_enable_usbdebug(unsigned int port); +void enable_usbdebug(unsigned int port); #endif /* SB600_H */
Modified: trunk/src/southbridge/amd/sb700/enable_usbdebug.c ============================================================================== --- trunk/src/southbridge/amd/sb700/enable_usbdebug.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/amd/sb700/enable_usbdebug.c Tue Apr 19 01:51:12 2011 (r6513) @@ -45,7 +45,7 @@ * This code currently only supports the first one, i.e., USB Debug devices * attached to physical USB ports belonging to the first EHCI device. */ -void sb7xx_51xx_enable_usbdebug(unsigned int port) +void enable_usbdebug(unsigned int port) { device_t dev = PCI_DEV(0, 0x12, 2); /* USB EHCI, D18:F2 */
Modified: trunk/src/southbridge/amd/sb700/sb700.h ============================================================================== --- trunk/src/southbridge/amd/sb700/sb700.h Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/amd/sb700/sb700.h Tue Apr 19 01:51:12 2011 (r6513) @@ -75,5 +75,5 @@ int s3_save_nvram_early(u32 dword, int size, int nvram_pos); int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
-void sb7xx_51xx_enable_usbdebug(unsigned int port); +void enable_usbdebug(unsigned int port); #endif /* SB700_H */
Modified: trunk/src/southbridge/amd/sb800/enable_usbdebug.c ============================================================================== --- trunk/src/southbridge/amd/sb800/enable_usbdebug.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/amd/sb800/enable_usbdebug.c Tue Apr 19 01:51:12 2011 (r6513) @@ -43,7 +43,7 @@ }
-void sb800_enable_usbdebug(unsigned int port) +void enable_usbdebug(unsigned int port) { pci_write_config32(PCI_DEV(0, SB800_DEVN_BASE + 0x13, 5), EHCI_BAR_INDEX, CONFIG_EHCI_BAR);
Modified: trunk/src/southbridge/amd/sb800/sb800.h ============================================================================== --- trunk/src/southbridge/amd/sb800/sb800.h Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/amd/sb800/sb800.h Tue Apr 19 01:51:12 2011 (r6513) @@ -58,7 +58,7 @@ int s3_save_nvram_early(u32 dword, int size, int nvram_pos); int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
-void sb800_enable_usbdebug(unsigned int port); +void enable_usbdebug(unsigned int port); #else void sb800_enable(device_t dev); void __attribute__((weak)) sb800_setup_sata_phys(struct device *dev);
Modified: trunk/src/southbridge/intel/i82801gx/Kconfig ============================================================================== --- trunk/src/southbridge/intel/i82801gx/Kconfig Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/intel/i82801gx/Kconfig Tue Apr 19 01:51:12 2011 (r6513) @@ -24,11 +24,19 @@ select HAVE_USBDEBUG select USE_WATCHDOG_ON_BOOT
+if SOUTHBRIDGE_INTEL_I82801GX + config EHCI_BAR hex - default 0xfef00000 if SOUTHBRIDGE_INTEL_I82801GX + default 0xfef00000
config EHCI_DEBUG_OFFSET hex - default 0xa0 if SOUTHBRIDGE_INTEL_I82801GX + default 0xa0 + +config USBDEBUG_DEFAULT_PORT + int + default 1 + +endif
Modified: trunk/src/southbridge/intel/i82801gx/i82801gx.h ============================================================================== --- trunk/src/southbridge/intel/i82801gx/i82801gx.h Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/intel/i82801gx/i82801gx.h Tue Apr 19 01:51:12 2011 (r6513) @@ -46,7 +46,7 @@ void enable_smbus(void); int smbus_read_byte(unsigned device, unsigned address); #endif -void i82801gx_enable_usbdebug(unsigned int port); +void enable_usbdebug(unsigned int port); #endif
#define MAINBOARD_POWER_OFF 0
Modified: trunk/src/southbridge/intel/i82801gx/usb_debug.c ============================================================================== --- trunk/src/southbridge/intel/i82801gx/usb_debug.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/intel/i82801gx/usb_debug.c Tue Apr 19 01:51:12 2011 (r6513) @@ -31,7 +31,7 @@ /* Not needed, the ICH* southbridges hardcode physical USB port 1. */ }
-void i82801gx_enable_usbdebug(unsigned int port) +void enable_usbdebug(unsigned int port) { u32 dbgctl; device_t dev = PCI_DEV(0, 0x1d, 7); /* USB EHCI, D29:F7 */
Modified: trunk/src/southbridge/intel/sch/usb_debug.c ============================================================================== --- trunk/src/southbridge/intel/sch/usb_debug.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/intel/sch/usb_debug.c Tue Apr 19 01:51:12 2011 (r6513) @@ -30,7 +30,7 @@ /* Not needed, the southbridges hardcode physical USB port 1. */ }
-void sch_enable_usbdebug(unsigned int port) +void enable_usbdebug(unsigned int port) { u32 dbgctl; device_t dev = PCI_DEV(0, 0x1d, 7); /* USB EHCI, D29:F7 */
Modified: trunk/src/southbridge/nvidia/ck804/ck804.h ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804.h Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/nvidia/ck804/ck804.h Tue Apr 19 01:51:12 2011 (r6513) @@ -24,7 +24,7 @@ #include "chip.h"
void ck804_enable(device_t dev); -void ck804_enable_usbdebug(unsigned int port); +void enable_usbdebug(unsigned int port);
extern struct pci_operations ck804_pci_ops;
Modified: trunk/src/southbridge/nvidia/ck804/enable_usbdebug.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/enable_usbdebug.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/nvidia/ck804/enable_usbdebug.c Tue Apr 19 01:51:12 2011 (r6513) @@ -46,7 +46,7 @@ pci_write_config32(dev, 0x74, dword); }
-void ck804_enable_usbdebug(unsigned int port) +void enable_usbdebug(unsigned int port) { device_t dev = PCI_DEV(0, CK804_DEVN_BASE + 2, 1); /* USB EHCI */
Modified: trunk/src/southbridge/nvidia/mcp55/enable_usbdebug.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/enable_usbdebug.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/nvidia/mcp55/enable_usbdebug.c Tue Apr 19 01:51:12 2011 (r6513) @@ -40,7 +40,7 @@ pci_write_config32(dev, 0x74, dword); }
-void mcp55_enable_usbdebug(unsigned int port) +void enable_usbdebug(unsigned int port) { device_t dev = PCI_DEV(0, MCP55_DEVN_BASE + 2, 1); /* USB EHCI */
Modified: trunk/src/southbridge/nvidia/mcp55/mcp55.h ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55.h Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/nvidia/mcp55/mcp55.h Tue Apr 19 01:51:12 2011 (r6513) @@ -35,7 +35,7 @@ #else #if !defined(__ROMCC__) void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn); -void mcp55_enable_usbdebug(unsigned int port); +void enable_usbdebug(unsigned int port); #endif #endif
Modified: trunk/src/southbridge/sis/sis966/enable_usbdebug.c ============================================================================== --- trunk/src/southbridge/sis/sis966/enable_usbdebug.c Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/sis/sis966/enable_usbdebug.c Tue Apr 19 01:51:12 2011 (r6513) @@ -42,7 +42,7 @@ pci_write_config32(dev, 0x74, dword); }
-void sis966_enable_usbdebug(unsigned int port) +void enable_usbdebug(unsigned int port) { device_t dev = PCI_DEV(0, SIS966_DEVN_BASE + 2, 1); /* USB EHCI */
Modified: trunk/src/southbridge/sis/sis966/sis966.h ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966.h Mon Apr 18 04:26:56 2011 (r6512) +++ trunk/src/southbridge/sis/sis966/sis966.h Tue Apr 19 01:51:12 2011 (r6513) @@ -40,7 +40,7 @@ #endif
#if defined(__PRE_RAM__) && !defined(__ROMCC__) -void sis966_enable_usbdebug(unsigned int port); +void enable_usbdebug(unsigned int port); #endif
#endif /* SIS966_H */