GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stefan Reinauer 2010-05-25 16:17:45 +00:00 committed by Stefan Reinauer
parent 56394484e3
commit da3237376f
30 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/console/Makefile.inc
View File

@ -10,7 +10,7 @@ initobj-y += vtxprintf.o
initobj-$(CONFIG_USE_DCACHE_RAM) += console.o initobj-$(CONFIG_USE_DCACHE_RAM) += console.o
driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_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_VGA) += vga_console.o
driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o
driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o

2
src/console/usbdebug_direct_console.c → src/console/usbdebug_console.c
View File

@ -17,7 +17,7 @@
#include <string.h> #include <string.h>
#include <console/console.h> #include <console/console.h>
#include <usbdebug_direct.h> #include <usbdebug.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
static struct ehci_debug_info dbg_info; static struct ehci_debug_info dbg_info;

2
src/cpu/intel/model_106cx/model_106cx_init.c
View File

@ -29,7 +29,7 @@
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <usbdebug_direct.h> #include <usbdebug.h>
static const uint32_t microcode_updates[] = { static const uint32_t microcode_updates[] = {
/* Dummy terminator */ /* Dummy terminator */

2
src/cpu/intel/model_6bx/model_6bx_init.c
View File

@ -30,7 +30,7 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <usbdebug_direct.h> #include <usbdebug.h>
static const uint32_t microcode_updates[] = { static const uint32_t microcode_updates[] = {
#include "microcode-737-MU16b11c.h" #include "microcode-737-MU16b11c.h"

2
src/cpu/intel/model_6ex/model_6ex_init.c
View File

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

2
src/cpu/intel/model_6fx/model_6fx_init.c
View File

@ -31,7 +31,7 @@
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <usbdebug_direct.h> #include <usbdebug.h>
static const uint32_t microcode_updates[] = { static const uint32_t microcode_updates[] = {
#include "microcode-2129-m206f257.h" #include "microcode-2129-m206f257.h"

0
src/include/usbdebug_direct.h → src/include/usbdebug.h
View File

3
src/lib/Makefile.inc
View File

@ -23,7 +23,8 @@ initobj-y += cbfs.o
initobj-y += lzma.o initobj-y += lzma.o
#initobj-y += lzmadecode.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_COMPRESSED_PAYLOAD_LZMA) += lzma.o
obj-$(CONFIG_BOOTSPLASH) += jpeg.o obj-$(CONFIG_BOOTSPLASH) += jpeg.o

2
src/lib/usbdebug_direct.c → src/lib/usbdebug.c
View File

@ -31,7 +31,7 @@
#include <usb_ch9.h> #include <usb_ch9.h>
#include <ehci.h> #include <ehci.h>
#include <usbdebug_direct.h> #include <usbdebug.h>
#define USB_DEBUG_DEVNUM 127 #define USB_DEBUG_DEVNUM 127

2
src/mainboard/getac/p470/romstage.c
View File

@ -40,7 +40,7 @@
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
#define DBGP_DEFAULT 0 #define DBGP_DEFAULT 0
#include "southbridge/intel/i82801gx/i82801gx_usb_debug.c" #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
#include "pc80/usbdebug_direct_serial.c" #include "pc80/usbdebug_serial.c"
#endif #endif
#include "lib/ramtest.c" #include "lib/ramtest.c"

4
src/mainboard/gigabyte/ga_2761gxdk/romstage.c
View File

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

4
src/mainboard/gigabyte/m57sli/romstage.c
View File

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

2
src/mainboard/intel/d945gclf/romstage.c
View File

@ -42,7 +42,7 @@
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
#define DBGP_DEFAULT 1 #define DBGP_DEFAULT 1
#include "southbridge/intel/i82801gx/i82801gx_usb_debug.c" #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
#include "pc80/usbdebug_direct_serial.c" #include "pc80/usbdebug_serial.c"
#endif #endif
#include "lib/ramtest.c" #include "lib/ramtest.c"

4
src/mainboard/kontron/986lcd-m/romstage.c
View File

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

4
src/mainboard/msi/ms7260/romstage.c
View File

@ -57,8 +57,8 @@
#include <console/console.h> #include <console/console.h>
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
#include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c"
#include "pc80/usbdebug_direct_serial.c" #include "pc80/usbdebug_serial.c"
#endif #endif
#include "lib/ramtest.c" #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>

4
src/mainboard/msi/ms9652_fam10/romstage.c
View File

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

4
src/mainboard/nvidia/l1_2pvv/romstage.c
View File

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

2
src/mainboard/roda/rk886ex/romstage.c
View File

@ -44,7 +44,7 @@
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
#define DBGP_DEFAULT 1 #define DBGP_DEFAULT 1
#include "southbridge/intel/i82801gx/i82801gx_usb_debug.c" #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c"
#include "pc80/usbdebug_direct_serial.c" #include "pc80/usbdebug_serial.c"
#endif #endif
#include "lib/ramtest.c" #include "lib/ramtest.c"

4
src/mainboard/tyan/s2912/romstage.c
View File

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

4
src/mainboard/tyan/s2912_fam10/romstage.c
View File

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

2
src/pc80/usbdebug_direct_serial.c → src/pc80/usbdebug_serial.c
View File

@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA * 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) static void early_usbdebug_direct_init(void)
{ {

0
src/southbridge/amd/sb600/sb600_enable_usbdebug_direct.c → src/southbridge/amd/sb600/sb600_enable_usbdebug.c
View File

2
src/southbridge/amd/sb600/sb600_usb.c
View File

@ -22,7 +22,7 @@
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <usbdebug_direct.h> #include <usbdebug.h>
#include <arch/io.h> #include <arch/io.h>
#include "sb600.h" #include "sb600.h"

0
src/southbridge/amd/sb700/sb700_enable_usbdebug_direct.c → src/southbridge/amd/sb700/sb700_enable_usbdebug.c
View File

2
src/southbridge/amd/sb700/sb700_usb.c
View File

@ -22,7 +22,7 @@
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <usbdebug_direct.h> #include <usbdebug.h>
#include <arch/io.h> #include <arch/io.h>
#include "sb700.h" #include "sb700.h"

2
src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
View File

@ -24,7 +24,7 @@
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include "i82801gx.h" #include "i82801gx.h"
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
#include <usbdebug_direct.h> #include <usbdebug.h>
#endif #endif
#include <arch/io.h> #include <arch/io.h>

0
src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c → src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c
View File

2
src/southbridge/nvidia/mcp55/mcp55_usb2.c
View File

@ -28,7 +28,7 @@
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include "mcp55.h" #include "mcp55.h"
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
#include <usbdebug_direct.h> #include <usbdebug.h>
#endif #endif
extern struct ehci_debug_info dbg_info; extern struct ehci_debug_info dbg_info;

0
src/southbridge/sis/sis966/sis966_enable_usbdebug_direct.c → src/southbridge/sis/sis966/sis966_enable_usbdebug.c
View File

2
src/southbridge/sis/sis966/sis966_usb2.c
View File

@ -31,7 +31,7 @@
#include <arch/io.h> #include <arch/io.h>
#include "sis966.h" #include "sis966.h"
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
#include <usbdebug_direct.h> #include <usbdebug.h>
#endif #endif
extern struct ehci_debug_info dbg_info; extern struct ehci_debug_info dbg_info;