diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-05-25 17:09:05 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-05-25 17:09:05 +0000 |
| commit | 7e00a44b773ba16b72fa1ca69825407be0c98ad5 (patch) | |
| tree | 57c5c75b90ccf375ae4cc30cc58581b8b301a6ca /src/cpu/intel/model_6fx | |
| parent | 75a05dc0b91fb5748bb4f8b0eee9cee168c2cda1 (diff) | |
| download | coreboot-7e00a44b773ba16b72fa1ca69825407be0c98ad5.tar.xz | |
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
Diffstat (limited to 'src/cpu/intel/model_6fx')
| -rw-r--r-- | src/cpu/intel/model_6fx/cache_as_ram.inc | 2 | ||||
| -rw-r--r-- | src/cpu/intel/model_6fx/model_6fx_init.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/intel/model_6fx/cache_as_ram.inc b/src/cpu/intel/model_6fx/cache_as_ram.inc index 0717116d0a..d5e38d8bd4 100644 --- a/src/cpu/intel/model_6fx/cache_as_ram.inc +++ b/src/cpu/intel/model_6fx/cache_as_ram.inc @@ -130,7 +130,7 @@ clear_mtrrs: movl %eax, %cr0 /* 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 */ movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax #else diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c index 3d2ca619ba..62b30da75b 100644 --- a/src/cpu/intel/model_6fx/model_6fx_init.c +++ b/src/cpu/intel/model_6fx/model_6fx_init.c @@ -211,7 +211,7 @@ static void configure_pic_thermal_sensors(void) wrmsr(PIC_SENS_CFG, msr); } -#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif @@ -229,7 +229,7 @@ static void model_6fx_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); -#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG // Is this caution really needed? if(!ehci_debug_addr) ehci_debug_addr = get_ehci_debug(); @@ -243,7 +243,7 @@ static void model_6fx_init(device_t cpu) /* Setup Page Attribute Tables (PAT) */ // TODO set up PAT -#if CONFIG_USBDEBUG_DIRECT +#if CONFIG_USBDEBUG set_ehci_debug(ehci_debug_addr); #endif |