also rename the config option.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5588 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
		
				
					committed by
					
						 Stefan Reinauer
						Stefan Reinauer
					
				
			
			
				
	
			
			
			
						parent
						
							75a05dc0b9
						
					
				
				
					commit
					7e00a44b77
				
			| @@ -146,7 +146,7 @@ static void lb_console(struct lb_header *header) | |||||||
| #if CONFIG_CONSOLE_SROM | #if CONFIG_CONSOLE_SROM | ||||||
| 	add_console(header, LB_TAG_CONSOLE_SROM); | 	add_console(header, LB_TAG_CONSOLE_SROM); | ||||||
| #endif | #endif | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	add_console(header, LB_TAG_CONSOLE_EHCI); | 	add_console(header, LB_TAG_CONSOLE_EHCI); | ||||||
| #endif | #endif | ||||||
| } | } | ||||||
|   | |||||||
| @@ -86,7 +86,7 @@ config TTYS0_LCS | |||||||
| 	depends on CONSOLE_SERIAL8250 | 	depends on CONSOLE_SERIAL8250 | ||||||
|  |  | ||||||
| # TODO: FIX DEPENDENCY HERE | # TODO: FIX DEPENDENCY HERE | ||||||
| config USBDEBUG_DIRECT | config USBDEBUG | ||||||
| 	bool "USB 2.0 EHCI debug dongle support" | 	bool "USB 2.0 EHCI debug dongle support" | ||||||
| 	default n | 	default n | ||||||
| 	help | 	help | ||||||
|   | |||||||
| @@ -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_console.o | driver-$(CONFIG_USBDEBUG) += 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 | ||||||
|   | |||||||
| @@ -462,7 +462,7 @@ static inline void k8_errata(void) | |||||||
|  |  | ||||||
| } | } | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| static unsigned ehci_debug_addr; | static unsigned ehci_debug_addr; | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -481,7 +481,7 @@ static void model_fxx_init(device_t dev) | |||||||
| 	get_fms(&c, dev->device); | 	get_fms(&c, dev->device); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	if (!ehci_debug_addr) | 	if (!ehci_debug_addr) | ||||||
| 		ehci_debug_addr = get_ehci_debug(); | 		ehci_debug_addr = get_ehci_debug(); | ||||||
| 	set_ehci_debug(0); | 	set_ehci_debug(0); | ||||||
| @@ -492,7 +492,7 @@ static void model_fxx_init(device_t dev) | |||||||
| 	amd_setup_mtrrs(); | 	amd_setup_mtrrs(); | ||||||
| 	x86_mtrr_check(); | 	x86_mtrr_check(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	set_ehci_debug(ehci_debug_addr); | 	set_ehci_debug(ehci_debug_addr); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -194,7 +194,7 @@ static void configure_pic_thermal_sensors(void) | |||||||
| 	wrmsr(PIC_SENS_CFG, msr); | 	wrmsr(PIC_SENS_CFG, msr); | ||||||
| } | } | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| static unsigned ehci_debug_addr; | static unsigned ehci_debug_addr; | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -212,7 +212,7 @@ static void model_1067x_init(device_t cpu) | |||||||
| 	fill_processor_name(processor_name); | 	fill_processor_name(processor_name); | ||||||
| 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	// Is this caution really needed? | 	// Is this caution really needed? | ||||||
| 	if(!ehci_debug_addr) | 	if(!ehci_debug_addr) | ||||||
| 		ehci_debug_addr = get_ehci_debug(); | 		ehci_debug_addr = get_ehci_debug(); | ||||||
| @@ -223,7 +223,7 @@ static void model_1067x_init(device_t cpu) | |||||||
| 	x86_setup_mtrrs(36); | 	x86_setup_mtrrs(36); | ||||||
| 	x86_mtrr_check(); | 	x86_mtrr_check(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	set_ehci_debug(ehci_debug_addr); | 	set_ehci_debug(ehci_debug_addr); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -123,7 +123,7 @@ clear_mtrrs: | |||||||
| 	movl	%eax, %cr0 | 	movl	%eax, %cr0 | ||||||
|  |  | ||||||
| 	/* Set up stack pointer */ | 	/* Set up stack pointer */ | ||||||
| #if defined(CONFIG_USBDEBUG_DIRECT) && (CONFIG_USBDEBUG_DIRECT == 1) | #if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) | ||||||
| 	/* leave some space for the struct ehci_debug_info */ | 	/* leave some space for the struct ehci_debug_info */ | ||||||
| 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax | 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax | ||||||
| #else | #else | ||||||
|   | |||||||
| @@ -155,7 +155,7 @@ static void configure_misc(void) | |||||||
| 	wrmsr(IA32_MISC_ENABLE, msr); | 	wrmsr(IA32_MISC_ENABLE, msr); | ||||||
| } | } | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| static unsigned ehci_debug_addr; | static unsigned ehci_debug_addr; | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -173,7 +173,7 @@ static void model_106cx_init(device_t cpu) | |||||||
| 	fill_processor_name(processor_name); | 	fill_processor_name(processor_name); | ||||||
| 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	// Is this caution really needed? | 	// Is this caution really needed? | ||||||
| 	if(!ehci_debug_addr) | 	if(!ehci_debug_addr) | ||||||
| 		ehci_debug_addr = get_ehci_debug(); | 		ehci_debug_addr = get_ehci_debug(); | ||||||
| @@ -184,7 +184,7 @@ static void model_106cx_init(device_t cpu) | |||||||
| 	x86_setup_mtrrs(32); | 	x86_setup_mtrrs(32); | ||||||
| 	x86_mtrr_check(); | 	x86_mtrr_check(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	set_ehci_debug(ehci_debug_addr); | 	set_ehci_debug(ehci_debug_addr); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -76,7 +76,7 @@ static void fill_processor_name(char *processor_name) | |||||||
| 	strcpy(processor_name, processor_name_start); | 	strcpy(processor_name, processor_name_start); | ||||||
| } | } | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| static unsigned ehci_debug_addr; | static unsigned ehci_debug_addr; | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -94,7 +94,7 @@ static void model_6bx_init(device_t cpu) | |||||||
| 	fill_processor_name(processor_name); | 	fill_processor_name(processor_name); | ||||||
| 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	// Is this caution really needed? | 	// Is this caution really needed? | ||||||
| 	if(!ehci_debug_addr) | 	if(!ehci_debug_addr) | ||||||
| 		ehci_debug_addr = get_ehci_debug(); | 		ehci_debug_addr = get_ehci_debug(); | ||||||
| @@ -105,7 +105,7 @@ static void model_6bx_init(device_t cpu) | |||||||
| 	x86_setup_mtrrs(36); | 	x86_setup_mtrrs(36); | ||||||
| 	x86_mtrr_check(); | 	x86_mtrr_check(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	set_ehci_debug(ehci_debug_addr); | 	set_ehci_debug(ehci_debug_addr); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -123,7 +123,7 @@ clear_mtrrs: | |||||||
| 	movl	%eax, %cr0 | 	movl	%eax, %cr0 | ||||||
|  |  | ||||||
| 	/* Set up stack pointer */ | 	/* Set up stack pointer */ | ||||||
| #if defined(CONFIG_USBDEBUG_DIRECT) && (CONFIG_USBDEBUG_DIRECT == 1) | #if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) | ||||||
| 	/* leave some space for the struct ehci_debug_info */ | 	/* leave some space for the struct ehci_debug_info */ | ||||||
| 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax | 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax | ||||||
| #else | #else | ||||||
|   | |||||||
| @@ -184,7 +184,7 @@ static void configure_pic_thermal_sensors(void) | |||||||
| 	wrmsr(PIC_SENS_CFG, msr); | 	wrmsr(PIC_SENS_CFG, msr); | ||||||
| } | } | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| static unsigned ehci_debug_addr; | static unsigned ehci_debug_addr; | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -202,7 +202,7 @@ static void model_6ex_init(device_t cpu) | |||||||
| 	fill_processor_name(processor_name); | 	fill_processor_name(processor_name); | ||||||
| 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	// Is this caution really needed? | 	// Is this caution really needed? | ||||||
| 	if(!ehci_debug_addr) | 	if(!ehci_debug_addr) | ||||||
| 		ehci_debug_addr = get_ehci_debug(); | 		ehci_debug_addr = get_ehci_debug(); | ||||||
| @@ -213,7 +213,7 @@ static void model_6ex_init(device_t cpu) | |||||||
| 	x86_setup_mtrrs(36); | 	x86_setup_mtrrs(36); | ||||||
| 	x86_mtrr_check(); | 	x86_mtrr_check(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	set_ehci_debug(ehci_debug_addr); | 	set_ehci_debug(ehci_debug_addr); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -130,7 +130,7 @@ clear_mtrrs: | |||||||
| 	movl	%eax, %cr0 | 	movl	%eax, %cr0 | ||||||
|  |  | ||||||
| 	/* Set up stack pointer */ | 	/* Set up stack pointer */ | ||||||
| #if defined(CONFIG_USBDEBUG_DIRECT) && (CONFIG_USBDEBUG_DIRECT == 1) | #if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) | ||||||
| 	/* leave some space for the struct ehci_debug_info */ | 	/* leave some space for the struct ehci_debug_info */ | ||||||
| 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax | 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax | ||||||
| #else | #else | ||||||
|   | |||||||
| @@ -211,7 +211,7 @@ static void configure_pic_thermal_sensors(void) | |||||||
| 	wrmsr(PIC_SENS_CFG, msr); | 	wrmsr(PIC_SENS_CFG, msr); | ||||||
| } | } | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| static unsigned ehci_debug_addr; | static unsigned ehci_debug_addr; | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -229,7 +229,7 @@ static void model_6fx_init(device_t cpu) | |||||||
| 	fill_processor_name(processor_name); | 	fill_processor_name(processor_name); | ||||||
| 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | 	printk(BIOS_INFO, "CPU: %s.\n", processor_name); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	// Is this caution really needed? | 	// Is this caution really needed? | ||||||
| 	if(!ehci_debug_addr) | 	if(!ehci_debug_addr) | ||||||
| 		ehci_debug_addr = get_ehci_debug(); | 		ehci_debug_addr = get_ehci_debug(); | ||||||
| @@ -243,7 +243,7 @@ static void model_6fx_init(device_t cpu) | |||||||
| 	/* Setup Page Attribute Tables (PAT) */ | 	/* Setup Page Attribute Tables (PAT) */ | ||||||
| 	// TODO set up PAT | 	// TODO set up PAT | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	set_ehci_debug(ehci_debug_addr); | 	set_ehci_debug(ehci_debug_addr); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ 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.o | obj-$(CONFIG_USBDEBUG) += usbdebug.o | ||||||
|  |  | ||||||
| obj-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.o | obj-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.o | ||||||
|  |  | ||||||
|   | |||||||
| @@ -37,7 +37,7 @@ | |||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #include <cpu/x86/bist.h> | #include <cpu/x86/bist.h> | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #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_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| @@ -320,7 +320,7 @@ void main(unsigned long bist) | |||||||
| 	/* Set up the console */ | 	/* Set up the console */ | ||||||
| 	uart_init(); | 	uart_init(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	i82801gx_enable_usbdebug(DBGP_DEFAULT); | 	i82801gx_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -83,7 +83,7 @@ void hardwaremain(int ret_addr) | |||||||
|  |  | ||||||
| 	id = get_node_core_id_x(); | 	id = get_node_core_id_x(); | ||||||
|  |  | ||||||
| 	//FIXME: for USBDEBUG_DIRECT you need to make sure dbg_info get assigned in AP | 	//FIXME: for USBDEBUG you need to make sure dbg_info get assigned in AP | ||||||
|         print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); |         print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); | ||||||
|  |  | ||||||
| 	train_ram(id.nodeid, sysinfo, sysinfox); | 	train_ram(id.nodeid, sysinfo, sysinfox); | ||||||
|   | |||||||
| @@ -54,7 +54,7 @@ | |||||||
| #include "pc80/mc146818rtc_early.c" | #include "pc80/mc146818rtc_early.c" | ||||||
|  |  | ||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include "southbridge/sis/sis966/sis966_enable_usbdebug.c" | #include "southbridge/sis/sis966/sis966_enable_usbdebug.c" | ||||||
| #include "pc80/usbdebug_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| #endif | #endif | ||||||
| @@ -199,7 +199,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) | |||||||
| 	/* Halt if there was a built in self test failure */ | 	/* Halt if there was a built in self test failure */ | ||||||
| 	report_bist_failure(bist); | 	report_bist_failure(bist); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	sis966_enable_usbdebug(DBGP_DEFAULT); | 	sis966_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -81,7 +81,7 @@ void hardwaremain(int ret_addr) | |||||||
|  |  | ||||||
| 	id = get_node_core_id_x(); | 	id = get_node_core_id_x(); | ||||||
|  |  | ||||||
| 	//FIXME: for USBDEBUG_DIRECT you need to make sure dbg_info get assigned in AP | 	//FIXME: for USBDEBUG you need to make sure dbg_info get assigned in AP | ||||||
|         print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); |         print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); | ||||||
|  |  | ||||||
| 	train_ram(id.nodeid, sysinfo, sysinfox); | 	train_ram(id.nodeid, sysinfo, sysinfox); | ||||||
|   | |||||||
| @@ -52,7 +52,7 @@ | |||||||
| #include "pc80/mc146818rtc_early.c" | #include "pc80/mc146818rtc_early.c" | ||||||
|  |  | ||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | ||||||
| #include "pc80/usbdebug_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| #endif | #endif | ||||||
| @@ -212,7 +212,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) | |||||||
| 	/* Halt if there was a built in self test failure */ | 	/* Halt if there was a built in self test failure */ | ||||||
| 	report_bist_failure(bist); | 	report_bist_failure(bist); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	mcp55_enable_usbdebug(DBGP_DEFAULT); | 	mcp55_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -39,7 +39,7 @@ | |||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #include <cpu/x86/bist.h> | #include <cpu/x86/bist.h> | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #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_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| @@ -236,7 +236,7 @@ void main(unsigned long bist) | |||||||
| 	/* Set up the console */ | 	/* Set up the console */ | ||||||
| 	uart_init(); | 	uart_init(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	i82801gx_enable_usbdebug(DBGP_DEFAULT); | 	i82801gx_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -48,7 +48,7 @@ | |||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #include <cpu/x86/bist.h> | #include <cpu/x86/bist.h> | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #define DBGP_DEFAULT 1 | #define DBGP_DEFAULT 1 | ||||||
| #include <usbdebug.h> | #include <usbdebug.h> | ||||||
| #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c" | #include "southbridge/intel/i82801gx/i82801gx_usb_debug.c" | ||||||
| @@ -380,7 +380,7 @@ void main(unsigned long bist) | |||||||
| 	/* Set up the console */ | 	/* Set up the console */ | ||||||
| 	uart_init(); | 	uart_init(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	i82801gx_enable_usbdebug(DBGP_DEFAULT); | 	i82801gx_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -67,7 +67,7 @@ void hardwaremain(int ret_addr) | |||||||
|  |  | ||||||
| 	id = get_node_core_id_x(); | 	id = get_node_core_id_x(); | ||||||
|  |  | ||||||
| 	/* FIXME: For USBDEBUG_DIRECT you need to make sure dbg_info gets | 	/* FIXME: For USBDEBUG you need to make sure dbg_info gets | ||||||
| 	 * assigned in AP. | 	 * assigned in AP. | ||||||
| 	 */ | 	 */ | ||||||
| 	print_debug("CODE IN CACHE ON NODE:"); | 	print_debug("CODE IN CACHE ON NODE:"); | ||||||
|   | |||||||
| @@ -56,7 +56,7 @@ | |||||||
| #include "pc80/mc146818rtc_early.c" | #include "pc80/mc146818rtc_early.c" | ||||||
|  |  | ||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | ||||||
| #include "pc80/usbdebug_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| #endif | #endif | ||||||
| @@ -181,7 +181,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) | |||||||
| 	setup_mb_resource_map(); | 	setup_mb_resource_map(); | ||||||
| 	uart_init(); | 	uart_init(); | ||||||
| 	report_bist_failure(bist); /* Halt upon BIST failure. */ | 	report_bist_failure(bist); /* Halt upon BIST failure. */ | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	mcp55_enable_usbdebug(DBGP_DEFAULT); | 	mcp55_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -159,7 +159,7 @@ config PCI_ROM_RUN | |||||||
| 	default y | 	default y | ||||||
| 	depends on BOARD_MSI_MS9652_FAM10 | 	depends on BOARD_MSI_MS9652_FAM10 | ||||||
|  |  | ||||||
| config USBDEBUG_DIRECT | config USBDEBUG | ||||||
| 	bool | 	bool | ||||||
| 	default n | 	default n | ||||||
| 	depends on BOARD_MSI_MS9652_FAM10 | 	depends on BOARD_MSI_MS9652_FAM10 | ||||||
|   | |||||||
| @@ -45,7 +45,7 @@ | |||||||
| #include <cpu/x86/lapic.h> | #include <cpu/x86/lapic.h> | ||||||
| #include "option_table.h" | #include "option_table.h" | ||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | ||||||
| #include "pc80/usbdebug_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| #endif | #endif | ||||||
| @@ -185,7 +185,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) | |||||||
| 	/* Halt if there was a built in self test failure */ | 	/* Halt if there was a built in self test failure */ | ||||||
| 	report_bist_failure(bist); | 	report_bist_failure(bist); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	mcp55_enable_usbdebug(DBGP_DEFAULT); | 	mcp55_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -81,7 +81,7 @@ void hardwaremain(int ret_addr) | |||||||
|  |  | ||||||
| 	id = get_node_core_id_x(); | 	id = get_node_core_id_x(); | ||||||
|  |  | ||||||
| 	//FIXME: for USBDEBUG_DIRECT you need to make sure dbg_info get assigned in AP | 	//FIXME: for USBDEBUG you need to make sure dbg_info get assigned in AP | ||||||
| 	print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); | 	print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); | ||||||
|  |  | ||||||
| 	train_ram(id.nodeid, sysinfo, sysinfox); | 	train_ram(id.nodeid, sysinfo, sysinfox); | ||||||
|   | |||||||
| @@ -52,7 +52,7 @@ | |||||||
| #include "pc80/mc146818rtc_early.c" | #include "pc80/mc146818rtc_early.c" | ||||||
|  |  | ||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | ||||||
| #include "pc80/usbdebug_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| #endif | #endif | ||||||
| @@ -198,7 +198,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) | |||||||
| 	/* Halt if there was a built in self test failure */ | 	/* Halt if there was a built in self test failure */ | ||||||
| 	report_bist_failure(bist); | 	report_bist_failure(bist); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	mcp55_enable_usbdebug(DBGP_DEFAULT); | 	mcp55_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -41,7 +41,7 @@ | |||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #include <cpu/x86/bist.h> | #include <cpu/x86/bist.h> | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #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_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| @@ -290,7 +290,7 @@ void main(unsigned long bist) | |||||||
| 	/* Set up the console */ | 	/* Set up the console */ | ||||||
| 	uart_init(); | 	uart_init(); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	i82801gx_enable_usbdebug(DBGP_DEFAULT); | 	i82801gx_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -78,7 +78,7 @@ void hardwaremain(int ret_addr) | |||||||
|  |  | ||||||
| 	id = get_node_core_id_x(); | 	id = get_node_core_id_x(); | ||||||
|  |  | ||||||
| 	//FIXME: for USBDEBUG_DIRECT you need to make sure dbg_info get assigned in AP | 	//FIXME: for USBDEBUG you need to make sure dbg_info get assigned in AP | ||||||
| 	print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); | 	print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); | ||||||
|  |  | ||||||
| 	train_ram(id.nodeid, sysinfo, sysinfox); | 	train_ram(id.nodeid, sysinfo, sysinfox); | ||||||
|   | |||||||
| @@ -52,7 +52,7 @@ | |||||||
| #include "pc80/mc146818rtc_early.c" | #include "pc80/mc146818rtc_early.c" | ||||||
|  |  | ||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | ||||||
| #include "pc80/usbdebug_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| #endif | #endif | ||||||
| @@ -192,7 +192,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) | |||||||
| 	/* Halt if there was a built in self test failure */ | 	/* Halt if there was a built in self test failure */ | ||||||
| 	report_bist_failure(bist); | 	report_bist_failure(bist); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	mcp55_enable_usbdebug(DBGP_DEFAULT); | 	mcp55_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -45,7 +45,7 @@ | |||||||
| #include <cpu/x86/lapic.h> | #include <cpu/x86/lapic.h> | ||||||
| #include "option_table.h" | #include "option_table.h" | ||||||
| #include <console/console.h> | #include <console/console.h> | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" | ||||||
| #include "pc80/usbdebug_serial.c" | #include "pc80/usbdebug_serial.c" | ||||||
| #endif | #endif | ||||||
| @@ -180,7 +180,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) | |||||||
| 	/* Halt if there was a built in self test failure */ | 	/* Halt if there was a built in self test failure */ | ||||||
| 	report_bist_failure(bist); | 	report_bist_failure(bist); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	mcp55_enable_usbdebug(DBGP_DEFAULT); | 	mcp55_enable_usbdebug(DBGP_DEFAULT); | ||||||
| 	early_usbdebug_init(); | 	early_usbdebug_init(); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -127,7 +127,7 @@ static void usb_init2(struct device *dev) | |||||||
|  |  | ||||||
| static void usb_set_resources(struct device *dev) | static void usb_set_resources(struct device *dev) | ||||||
| { | { | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	struct resource *res; | 	struct resource *res; | ||||||
| 	u32 base; | 	u32 base; | ||||||
| 	u32 old_debug; | 	u32 old_debug; | ||||||
| @@ -137,7 +137,7 @@ static void usb_set_resources(struct device *dev) | |||||||
| #endif | #endif | ||||||
| 	pci_dev_set_resources(dev); | 	pci_dev_set_resources(dev); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	res = find_resource(dev, 0x10); | 	res = find_resource(dev, 0x10); | ||||||
| 	set_ehci_debug(old_debug); | 	set_ehci_debug(old_debug); | ||||||
| 	if (!res) | 	if (!res) | ||||||
|   | |||||||
| @@ -169,7 +169,7 @@ static void usb_init2(struct device *dev) | |||||||
|  |  | ||||||
| static void usb_set_resources(struct device *dev) | static void usb_set_resources(struct device *dev) | ||||||
| { | { | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	struct resource *res; | 	struct resource *res; | ||||||
| 	u32 base; | 	u32 base; | ||||||
| 	u32 old_debug; | 	u32 old_debug; | ||||||
| @@ -179,7 +179,7 @@ static void usb_set_resources(struct device *dev) | |||||||
| #endif | #endif | ||||||
| 	pci_dev_set_resources(dev); | 	pci_dev_set_resources(dev); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	res = find_resource(dev, 0x10); | 	res = find_resource(dev, 0x10); | ||||||
| 	set_ehci_debug(old_debug); | 	set_ehci_debug(old_debug); | ||||||
| 	if (!res) | 	if (!res) | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ | |||||||
| #include <device/pci.h> | #include <device/pci.h> | ||||||
| #include <device/pci_ids.h> | #include <device/pci_ids.h> | ||||||
| #include "i82801gx.h" | #include "i82801gx.h" | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include <usbdebug.h> | #include <usbdebug.h> | ||||||
| #endif | #endif | ||||||
| #include <arch/io.h> | #include <arch/io.h> | ||||||
| @@ -87,7 +87,7 @@ static void usb_ehci_set_subsystem(device_t dev, unsigned vendor, unsigned devic | |||||||
|  |  | ||||||
| static void usb_ehci_set_resources(struct device *dev) | static void usb_ehci_set_resources(struct device *dev) | ||||||
| { | { | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	struct resource *res; | 	struct resource *res; | ||||||
| 	u32 base; | 	u32 base; | ||||||
| 	u32 usb_debug; | 	u32 usb_debug; | ||||||
| @@ -97,7 +97,7 @@ static void usb_ehci_set_resources(struct device *dev) | |||||||
| #endif | #endif | ||||||
| 	pci_dev_set_resources(dev); | 	pci_dev_set_resources(dev); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	res = find_resource(dev, 0x10); | 	res = find_resource(dev, 0x10); | ||||||
| 	set_ehci_debug(usb_debug); | 	set_ehci_debug(usb_debug); | ||||||
| 	if (!res) return; | 	if (!res) return; | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ | |||||||
| #include <device/pci_ids.h> | #include <device/pci_ids.h> | ||||||
| #include <device/pci_ops.h> | #include <device/pci_ops.h> | ||||||
| #include "mcp55.h" | #include "mcp55.h" | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include <usbdebug.h> | #include <usbdebug.h> | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -43,7 +43,7 @@ static void usb2_init(struct device *dev) | |||||||
|  |  | ||||||
| static void usb2_set_resources(struct device *dev) | static void usb2_set_resources(struct device *dev) | ||||||
| { | { | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	struct resource *res; | 	struct resource *res; | ||||||
| 	unsigned base; | 	unsigned base; | ||||||
| 	unsigned old_debug; | 	unsigned old_debug; | ||||||
| @@ -53,7 +53,7 @@ static void usb2_set_resources(struct device *dev) | |||||||
| #endif | #endif | ||||||
| 	pci_dev_set_resources(dev); | 	pci_dev_set_resources(dev); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	res = find_resource(dev, 0x10); | 	res = find_resource(dev, 0x10); | ||||||
| 	set_ehci_debug(old_debug); | 	set_ehci_debug(old_debug); | ||||||
| 	if (!res) return; | 	if (!res) return; | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ | |||||||
| #include <device/pci_ops.h> | #include <device/pci_ops.h> | ||||||
| #include <arch/io.h> | #include <arch/io.h> | ||||||
| #include "sis966.h" | #include "sis966.h" | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| #include <usbdebug.h> | #include <usbdebug.h> | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -123,7 +123,7 @@ static void usb2_init(struct device *dev) | |||||||
|  |  | ||||||
| static void usb2_set_resources(struct device *dev) | static void usb2_set_resources(struct device *dev) | ||||||
| { | { | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	struct resource *res; | 	struct resource *res; | ||||||
| 	unsigned base; | 	unsigned base; | ||||||
| 	unsigned old_debug; | 	unsigned old_debug; | ||||||
| @@ -133,7 +133,7 @@ static void usb2_set_resources(struct device *dev) | |||||||
| #endif | #endif | ||||||
| 	pci_dev_set_resources(dev); | 	pci_dev_set_resources(dev); | ||||||
|  |  | ||||||
| #if CONFIG_USBDEBUG_DIRECT | #if CONFIG_USBDEBUG | ||||||
| 	res = find_resource(dev, 0x10); | 	res = find_resource(dev, 0x10); | ||||||
| 	set_ehci_debug(old_debug); | 	set_ehci_debug(old_debug); | ||||||
| 	if (!res) return; | 	if (!res) return; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user