diff options
30 files changed, 34 insertions, 33 deletions
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index cb8c1dfba5..f5fa880b66 100644 --- 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 diff --git a/src/console/usbdebug_direct_console.c b/src/console/usbdebug_console.c index d1006598b0..2e71cc3ea3 100644 --- a/src/console/usbdebug_direct_console.c +++ b/src/console/usbdebug_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; diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c index 65dfebba5b..79164beae7 100644 --- 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 */ diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c index 783138ec83..f8a4a77de2 100644 --- 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" diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c index 4f1d2043b6..91cde9350e 100644 --- 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" diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c index 3d1e9ba9a3..3d2ca619ba 100644 --- 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" diff --git a/src/include/usbdebug_direct.h b/src/include/usbdebug.h index b9d170b1f3..b9d170b1f3 100644 --- a/src/include/usbdebug_direct.h +++ b/src/include/usbdebug.h diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 5b4091251a..6d32de9e37 100644 --- 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 diff --git a/src/lib/usbdebug_direct.c b/src/lib/usbdebug.c index 19ce15086f..56ec1e3459 100644 --- a/src/lib/usbdebug_direct.c +++ b/src/lib/usbdebug.c @@ -31,7 +31,7 @@ #include <usb_ch9.h> #include <ehci.h> -#include <usbdebug_direct.h> +#include <usbdebug.h> #define USB_DEBUG_DEVNUM 127 diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c index ecc9e4bb03..0da4b8f293 100644 --- 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" diff --git a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c index 5aee58d867..3ba256a606 100644 --- 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" diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c index ad6ee79ab7..683f92b5f6 100644 --- 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" diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c index c50a66f776..961069a59a 100644 --- 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" diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c index cb40034751..94a5065fa1 100644 --- 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" diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c index 167fa34e26..55adf23dba 100644 --- 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> diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c index 1e44c86c5b..e0566b6114 100644 --- 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" diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c index db93735052..d5b717f8b3 100644 --- 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" diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c index 803aaee89b..a910d1aadd 100644 --- 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" diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c index 180b1eb26f..4f536e77d7 100644 --- 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" diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c index 5d54713ece..5290470929 100644 --- 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" diff --git a/src/pc80/usbdebug_direct_serial.c b/src/pc80/usbdebug_serial.c index 15eac02306..474882b6d1 100644 --- a/src/pc80/usbdebug_direct_serial.c +++ b/src/pc80/usbdebug_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) { diff --git a/src/southbridge/amd/sb600/sb600_enable_usbdebug_direct.c b/src/southbridge/amd/sb600/sb600_enable_usbdebug.c index 5fded2fa3f..5fded2fa3f 100644 --- a/src/southbridge/amd/sb600/sb600_enable_usbdebug_direct.c +++ b/src/southbridge/amd/sb600/sb600_enable_usbdebug.c diff --git a/src/southbridge/amd/sb600/sb600_usb.c b/src/southbridge/amd/sb600/sb600_usb.c index b6e1fbec6b..3b5e5f562b 100644 --- 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" diff --git a/src/southbridge/amd/sb700/sb700_enable_usbdebug_direct.c b/src/southbridge/amd/sb700/sb700_enable_usbdebug.c index b739fe2b5a..b739fe2b5a 100644 --- a/src/southbridge/amd/sb700/sb700_enable_usbdebug_direct.c +++ b/src/southbridge/amd/sb700/sb700_enable_usbdebug.c diff --git a/src/southbridge/amd/sb700/sb700_usb.c b/src/southbridge/amd/sb700/sb700_usb.c index d2dcf852f2..3b08798209 100644 --- 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" diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c index 1bc5fcaecb..530518c8e2 100644 --- 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> diff --git a/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c b/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c index 1c7a26bffc..1c7a26bffc 100644 --- a/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c +++ b/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c diff --git a/src/southbridge/nvidia/mcp55/mcp55_usb2.c b/src/southbridge/nvidia/mcp55/mcp55_usb2.c index 86c124c690..cf603848ad 100644 --- 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; diff --git a/src/southbridge/sis/sis966/sis966_enable_usbdebug_direct.c b/src/southbridge/sis/sis966/sis966_enable_usbdebug.c index f17a79e6c4..f17a79e6c4 100644 --- a/src/southbridge/sis/sis966/sis966_enable_usbdebug_direct.c +++ b/src/southbridge/sis/sis966/sis966_enable_usbdebug.c diff --git a/src/southbridge/sis/sis966/sis966_usb2.c b/src/southbridge/sis/sis966/sis966_usb2.c index 108cfee894..9d0fa15a57 100644 --- 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; |