From da3237376f8f4d35731ef9abfb7a7e5b94926198 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 25 May 2010 16:17:45 +0000 Subject: [PATCH] Long ago we agreed on kicking the _direct appendix because everything in coreboot is direct. This patch does it. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5586 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/console/Makefile.inc | 2 +- src/console/{usbdebug_direct_console.c => usbdebug_console.c} | 2 +- src/cpu/intel/model_106cx/model_106cx_init.c | 2 +- src/cpu/intel/model_6bx/model_6bx_init.c | 2 +- src/cpu/intel/model_6ex/model_6ex_init.c | 2 +- src/cpu/intel/model_6fx/model_6fx_init.c | 2 +- src/include/{usbdebug_direct.h => usbdebug.h} | 0 src/lib/Makefile.inc | 3 ++- src/lib/{usbdebug_direct.c => usbdebug.c} | 2 +- src/mainboard/getac/p470/romstage.c | 2 +- src/mainboard/gigabyte/ga_2761gxdk/romstage.c | 4 ++-- src/mainboard/gigabyte/m57sli/romstage.c | 4 ++-- src/mainboard/intel/d945gclf/romstage.c | 2 +- src/mainboard/kontron/986lcd-m/romstage.c | 4 ++-- src/mainboard/msi/ms7260/romstage.c | 4 ++-- src/mainboard/msi/ms9652_fam10/romstage.c | 4 ++-- src/mainboard/nvidia/l1_2pvv/romstage.c | 4 ++-- src/mainboard/roda/rk886ex/romstage.c | 2 +- src/mainboard/tyan/s2912/romstage.c | 4 ++-- src/mainboard/tyan/s2912_fam10/romstage.c | 4 ++-- src/pc80/{usbdebug_direct_serial.c => usbdebug_serial.c} | 2 +- ...sb600_enable_usbdebug_direct.c => sb600_enable_usbdebug.c} | 0 src/southbridge/amd/sb600/sb600_usb.c | 2 +- ...sb700_enable_usbdebug_direct.c => sb700_enable_usbdebug.c} | 0 src/southbridge/amd/sb700/sb700_usb.c | 2 +- src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c | 2 +- ...mcp55_enable_usbdebug_direct.c => mcp55_enable_usbdebug.c} | 0 src/southbridge/nvidia/mcp55/mcp55_usb2.c | 2 +- ...s966_enable_usbdebug_direct.c => sis966_enable_usbdebug.c} | 0 src/southbridge/sis/sis966/sis966_usb2.c | 2 +- 30 files changed, 34 insertions(+), 33 deletions(-) rename src/console/{usbdebug_direct_console.c => usbdebug_console.c} (98%) rename src/include/{usbdebug_direct.h => usbdebug.h} (100%) rename src/lib/{usbdebug_direct.c => usbdebug.c} (99%) rename src/pc80/{usbdebug_direct_serial.c => usbdebug_serial.c} (97%) rename src/southbridge/amd/sb600/{sb600_enable_usbdebug_direct.c => sb600_enable_usbdebug.c} (100%) rename src/southbridge/amd/sb700/{sb700_enable_usbdebug_direct.c => sb700_enable_usbdebug.c} (100%) rename src/southbridge/nvidia/mcp55/{mcp55_enable_usbdebug_direct.c => mcp55_enable_usbdebug.c} (100%) rename src/southbridge/sis/sis966/{sis966_enable_usbdebug_direct.c => sis966_enable_usbdebug.c} (100%) diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index cb8c1dfba..f5fa880b6 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 similarity index 98% rename from src/console/usbdebug_direct_console.c rename to src/console/usbdebug_console.c index d1006598b..2e71cc3ea 100644 --- a/src/console/usbdebug_direct_console.c +++ b/src/console/usbdebug_console.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include 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 65dfebba5..79164beae 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 #include #include -#include +#include 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 783138ec8..f8a4a77de 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 #include #include -#include +#include 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 4f1d2043b..91cde9350 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 #include #include -#include +#include 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 3d1e9ba9a..3d2ca619b 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 #include #include -#include +#include static const uint32_t microcode_updates[] = { #include "microcode-2129-m206f257.h" diff --git a/src/include/usbdebug_direct.h b/src/include/usbdebug.h similarity index 100% rename from src/include/usbdebug_direct.h rename to src/include/usbdebug.h diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 5b4091251..6d32de9e3 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 similarity index 99% rename from src/lib/usbdebug_direct.c rename to src/lib/usbdebug.c index 19ce15086..56ec1e345 100644 --- a/src/lib/usbdebug_direct.c +++ b/src/lib/usbdebug.c @@ -31,7 +31,7 @@ #include #include -#include +#include #define USB_DEBUG_DEVNUM 127 diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c index ecc9e4bb0..0da4b8f29 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 5aee58d86..3ba256a60 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c +++ b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c @@ -55,8 +55,8 @@ #include #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 ad6ee79ab..683f92b5f 100644 --- a/src/mainboard/gigabyte/m57sli/romstage.c +++ b/src/mainboard/gigabyte/m57sli/romstage.c @@ -53,8 +53,8 @@ #include #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 c50a66f77..961069a59 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 cb4003475..94a5065fa 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 +#include #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 167fa34e2..55adf23db 100644 --- a/src/mainboard/msi/ms7260/romstage.c +++ b/src/mainboard/msi/ms7260/romstage.c @@ -57,8 +57,8 @@ #include #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 diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c index 1e44c86c5..e0566b611 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 #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 db9373505..d5b717f8b 100644 --- a/src/mainboard/nvidia/l1_2pvv/romstage.c +++ b/src/mainboard/nvidia/l1_2pvv/romstage.c @@ -53,8 +53,8 @@ #include #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 803aaee89..a910d1aad 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 180b1eb26..4f536e77d 100644 --- a/src/mainboard/tyan/s2912/romstage.c +++ b/src/mainboard/tyan/s2912/romstage.c @@ -53,8 +53,8 @@ #include #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 5d54713ec..529047092 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 #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 similarity index 97% rename from src/pc80/usbdebug_direct_serial.c rename to src/pc80/usbdebug_serial.c index 15eac0230..474882b6d 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 similarity index 100% rename from src/southbridge/amd/sb600/sb600_enable_usbdebug_direct.c rename to 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 b6e1fbec6..3b5e5f562 100644 --- a/src/southbridge/amd/sb600/sb600_usb.c +++ b/src/southbridge/amd/sb600/sb600_usb.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "sb600.h" diff --git a/src/southbridge/amd/sb700/sb700_enable_usbdebug_direct.c b/src/southbridge/amd/sb700/sb700_enable_usbdebug.c similarity index 100% rename from src/southbridge/amd/sb700/sb700_enable_usbdebug_direct.c rename to 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 d2dcf852f..3b0879820 100644 --- a/src/southbridge/amd/sb700/sb700_usb.c +++ b/src/southbridge/amd/sb700/sb700_usb.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "sb700.h" diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c index 1bc5fcaec..530518c8e 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c +++ b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c @@ -24,7 +24,7 @@ #include #include "i82801gx.h" #if CONFIG_USBDEBUG_DIRECT -#include +#include #endif #include diff --git a/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c b/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c similarity index 100% rename from src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c rename to 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 86c124c69..cf603848a 100644 --- a/src/southbridge/nvidia/mcp55/mcp55_usb2.c +++ b/src/southbridge/nvidia/mcp55/mcp55_usb2.c @@ -28,7 +28,7 @@ #include #include "mcp55.h" #if CONFIG_USBDEBUG_DIRECT -#include +#include #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 similarity index 100% rename from src/southbridge/sis/sis966/sis966_enable_usbdebug_direct.c rename to 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 108cfee89..9d0fa15a5 100644 --- a/src/southbridge/sis/sis966/sis966_usb2.c +++ b/src/southbridge/sis/sis966/sis966_usb2.c @@ -31,7 +31,7 @@ #include #include "sis966.h" #if CONFIG_USBDEBUG_DIRECT -#include +#include #endif extern struct ehci_debug_info dbg_info; -- 2.25.1