Long ago we agreed on kicking the _direct appendix because everything in

coreboot is direct. This patch does it. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5586 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2010-05-25 16:17:45 +00:00 · 2010-05-25 16:17:45 +00:00 · da3237376f
parent 56394484e3
commit da3237376f
30 changed files with 34 additions and 33 deletions
--- 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_direct_console.o
+driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_console.o
 driver-$(CONFIG_CONSOLE_VGA) += vga_console.o
 driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o
 driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o
--- a/src/console/usbdebug_direct_console.c
+++ b/src/console/usbdebug_direct_console.c
@ -17,7 +17,7 @@

 #include <string.h>
 #include <console/console.h>
-#include <usbdebug_direct.h>
+#include <usbdebug.h>
 #include <pc80/mc146818rtc.h>

 static struct ehci_debug_info dbg_info;
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@ -29,7 +29,7 @@
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mtrr.h>
-#include <usbdebug_direct.h>
+#include <usbdebug.h>

 static const uint32_t microcode_updates[] = {
 	/*  Dummy terminator  */
--- a/src/cpu/intel/model_6bx/model_6bx_init.c
+++ b/src/cpu/intel/model_6bx/model_6bx_init.c
@ -30,7 +30,7 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
-#include <usbdebug_direct.h>
+#include <usbdebug.h>

 static const uint32_t microcode_updates[] = {
 	#include "microcode-737-MU16b11c.h"
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@ -31,7 +31,7 @@
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mtrr.h>
-#include <usbdebug_direct.h>
+#include <usbdebug.h>

 static const uint32_t microcode_updates[] = {
 	#include "microcode-1624-m206e839.h"
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@ -31,7 +31,7 @@
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mtrr.h>
-#include <usbdebug_direct.h>
+#include <usbdebug.h>

 static const uint32_t microcode_updates[] = {
 	#include "microcode-2129-m206f257.h"
--- a/src/include/usbdebug_direct.h
+++ b/src/include/usbdebug_direct.h
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@ -23,7 +23,8 @@ initobj-y += cbfs.o
 initobj-y += lzma.o
 #initobj-y += lzmadecode.o

-obj-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_direct.o
+obj-$(CONFIG_USBDEBUG_DIRECT) += usbdebug.o
+
 obj-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.o

 obj-$(CONFIG_BOOTSPLASH) += jpeg.o
--- a/src/lib/usbdebug_direct.c
+++ b/src/lib/usbdebug_direct.c
@ -31,7 +31,7 @@

 #include <usb_ch9.h>
 #include <ehci.h>
-#include <usbdebug_direct.h>
+#include <usbdebug.h>

 #define USB_DEBUG_DEVNUM 127

--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@ -40,7 +40,7 @@
 #if CONFIG_USBDEBUG_DIRECT
 #define DBGP_DEFAULT 0
 #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "pc80/usbdebug_serial.c"
 #endif

 #include "lib/ramtest.c"
--- a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
@ -55,8 +55,8 @@

 #include <console/console.h>
 #if CONFIG_USBDEBUG_DIRECT
-#include "southbridge/sis/sis966/sis966_enable_usbdebug_direct.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "southbridge/sis/sis966/sis966_enable_usbdebug.c"
+#include "pc80/usbdebug_serial.c"
 #endif
 #include "lib/ramtest.c"

--- a/src/mainboard/gigabyte/m57sli/romstage.c
+++ b/src/mainboard/gigabyte/m57sli/romstage.c
@ -53,8 +53,8 @@

 #include <console/console.h>
 #if CONFIG_USBDEBUG_DIRECT
-#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
+#include "pc80/usbdebug_serial.c"
 #endif
 #include "lib/ramtest.c"

--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@ -42,7 +42,7 @@
 #if CONFIG_USBDEBUG_DIRECT
 #define DBGP_DEFAULT 1
 #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "pc80/usbdebug_serial.c"
 #endif

 #include "lib/ramtest.c"
--- a/src/mainboard/kontron/986lcd-m/romstage.c
+++ b/src/mainboard/kontron/986lcd-m/romstage.c
@ -50,9 +50,9 @@

 #if CONFIG_USBDEBUG_DIRECT
 #define DBGP_DEFAULT 1
-#include <usbdebug_direct.h>
+#include <usbdebug.h>
 #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "pc80/usbdebug_serial.c"
 #endif

 #include "lib/ramtest.c"
--- a/src/mainboard/msi/ms7260/romstage.c
+++ b/src/mainboard/msi/ms7260/romstage.c
@ -57,8 +57,8 @@

 #include <console/console.h>
 #if CONFIG_USBDEBUG_DIRECT
-#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
+#include "pc80/usbdebug_serial.c"
 #endif
 #include "lib/ramtest.c"
 #include <cpu/amd/model_fxx_rev.h>
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@ -46,8 +46,8 @@
 #include "option_table.h"
 #include <console/console.h>
 #if CONFIG_USBDEBUG_DIRECT
-#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
+#include "pc80/usbdebug_serial.c"
 #endif
 #include "lib/ramtest.c"

--- a/src/mainboard/nvidia/l1_2pvv/romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/romstage.c
@ -53,8 +53,8 @@

 #include <console/console.h>
 #if CONFIG_USBDEBUG_DIRECT
-#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
+#include "pc80/usbdebug_serial.c"
 #endif
 #include "lib/ramtest.c"

--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@ -44,7 +44,7 @@
 #if CONFIG_USBDEBUG_DIRECT
 #define DBGP_DEFAULT 1
 #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "pc80/usbdebug_serial.c"
 #endif

 #include "lib/ramtest.c"
--- a/src/mainboard/tyan/s2912/romstage.c
+++ b/src/mainboard/tyan/s2912/romstage.c
@ -53,8 +53,8 @@

 #include <console/console.h>
 #if CONFIG_USBDEBUG_DIRECT
-#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
+#include "pc80/usbdebug_serial.c"
 #endif
 #include "lib/ramtest.c"

--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@ -46,8 +46,8 @@
 #include "option_table.h"
 #include <console/console.h>
 #if CONFIG_USBDEBUG_DIRECT
-#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c"
-#include "pc80/usbdebug_direct_serial.c"
+#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
+#include "pc80/usbdebug_serial.c"
 #endif
 #include "lib/ramtest.c"

--- a/src/pc80/usbdebug_direct_serial.c
+++ b/src/pc80/usbdebug_direct_serial.c
@ -15,7 +15,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
 */

-#include "../lib/usbdebug_direct.c"
+#include "../lib/usbdebug.c"

 static void early_usbdebug_direct_init(void)
 {
--- a/src/southbridge/amd/sb600/sb600_enable_usbdebug_direct.c
+++ b/src/southbridge/amd/sb600/sb600_enable_usbdebug_direct.c
--- a/src/southbridge/amd/sb600/sb600_usb.c
+++ b/src/southbridge/amd/sb600/sb600_usb.c
@ -22,7 +22,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <usbdebug_direct.h>
+#include <usbdebug.h>
 #include <arch/io.h>
 #include "sb600.h"

--- a/src/southbridge/amd/sb700/sb700_enable_usbdebug_direct.c
+++ b/src/southbridge/amd/sb700/sb700_enable_usbdebug_direct.c
--- a/src/southbridge/amd/sb700/sb700_usb.c
+++ b/src/southbridge/amd/sb700/sb700_usb.c
@ -22,7 +22,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <usbdebug_direct.h>
+#include <usbdebug.h>
 #include <arch/io.h>
 #include "sb700.h"

--- a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
@ -24,7 +24,7 @@
 #include <device/pci_ids.h>
 #include "i82801gx.h"
 #if CONFIG_USBDEBUG_DIRECT
-#include <usbdebug_direct.h>
+#include <usbdebug.h>
 #endif
 #include <arch/io.h>

--- a/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c
--- a/src/southbridge/nvidia/mcp55/mcp55_usb2.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
@ -28,7 +28,7 @@
 #include <device/pci_ops.h>
 #include "mcp55.h"
 #if CONFIG_USBDEBUG_DIRECT
-#include <usbdebug_direct.h>
+#include <usbdebug.h>
 #endif

 extern struct ehci_debug_info dbg_info;
--- a/src/southbridge/sis/sis966/sis966_enable_usbdebug_direct.c
+++ b/src/southbridge/sis/sis966/sis966_enable_usbdebug_direct.c
--- a/src/southbridge/sis/sis966/sis966_usb2.c
+++ b/src/southbridge/sis/sis966/sis966_usb2.c
@ -31,7 +31,7 @@
 #include <arch/io.h>
 #include "sis966.h"
 #if CONFIG_USBDEBUG_DIRECT
-#include <usbdebug_direct.h>
+#include <usbdebug.h>
 #endif

 extern struct ehci_debug_info dbg_info;