more ifdef -> if fixes
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6536 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
1d888a9784
commit
d4814bd41c
|
@ -1,7 +1,7 @@
|
||||||
#include <console/console.h>
|
#include <console/console.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#if defined(CONFIG_GDB_STUB) && CONFIG_GDB_STUB == 1
|
#if CONFIG_GDB_STUB
|
||||||
|
|
||||||
/* BUFMAX defines the maximum number of characters in inbound/outbound buffers.
|
/* BUFMAX defines the maximum number of characters in inbound/outbound buffers.
|
||||||
* At least NUM_REGBYTES*2 are needed for register packets
|
* At least NUM_REGBYTES*2 are needed for register packets
|
||||||
|
|
|
@ -91,7 +91,7 @@ void setup_ioapic(u32 ioapic_base, u8 ioapic_id)
|
||||||
|
|
||||||
// XXX this decision should probably be made elsewhere, and
|
// XXX this decision should probably be made elsewhere, and
|
||||||
// it's the C3, not the EPIA this depends on.
|
// it's the C3, not the EPIA this depends on.
|
||||||
#if defined(CONFIG_EPIA_VT8237R_INIT) && CONFIG_EPIA_VT8237R_INIT
|
#if CONFIG_EPIA_VT8237R_INIT
|
||||||
#define IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
|
#define IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
|
||||||
#else
|
#else
|
||||||
#define IOAPIC_INTERRUPTS_ON_FSB
|
#define IOAPIC_INTERRUPTS_ON_FSB
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
|
|
||||||
void post_code(uint8_t value)
|
void post_code(uint8_t value)
|
||||||
{
|
{
|
||||||
#if !defined(CONFIG_NO_POST) || CONFIG_NO_POST==0
|
#if !CONFIG_NO_POST
|
||||||
#if CONFIG_CONSOLE_POST==1
|
#if CONFIG_CONSOLE_POST
|
||||||
print_emerg("POST: 0x");
|
print_emerg("POST: 0x");
|
||||||
print_emerg_hex8(value);
|
print_emerg_hex8(value);
|
||||||
print_emerg("\n");
|
print_emerg("\n");
|
||||||
|
|
|
@ -281,7 +281,7 @@ clear_fixed_var_mtrr_out:
|
||||||
|
|
||||||
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
||||||
|
|
||||||
#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
|
#if CONFIG_TINY_BOOTBLOCK
|
||||||
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
||||||
#else
|
#else
|
||||||
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
||||||
|
|
|
@ -231,7 +231,7 @@ clear_fixed_var_mtrr_out:
|
||||||
|
|
||||||
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
||||||
|
|
||||||
#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
|
#if CONFIG_TINY_BOOTBLOCK
|
||||||
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
||||||
#else
|
#else
|
||||||
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
||||||
|
|
|
@ -102,7 +102,7 @@ clear_mtrrs:
|
||||||
/* Enable cache for our code in Flash because we do XIP here */
|
/* Enable cache for our code in Flash because we do XIP here */
|
||||||
movl $MTRRphysBase_MSR(1), %ecx
|
movl $MTRRphysBase_MSR(1), %ecx
|
||||||
xorl %edx, %edx
|
xorl %edx, %edx
|
||||||
#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
|
#if CONFIG_TINY_BOOTBLOCK
|
||||||
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
||||||
#else
|
#else
|
||||||
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
||||||
|
@ -128,7 +128,7 @@ clear_mtrrs:
|
||||||
movl %eax, %cr0
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Set up the stack pointer. */
|
/* Set up the stack pointer. */
|
||||||
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
#if CONFIG_USBDEBUG
|
||||||
/* 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
|
||||||
|
|
|
@ -102,7 +102,7 @@ clear_mtrrs:
|
||||||
/* Enable cache for our code in Flash because we do XIP here */
|
/* Enable cache for our code in Flash because we do XIP here */
|
||||||
movl $MTRRphysBase_MSR(1), %ecx
|
movl $MTRRphysBase_MSR(1), %ecx
|
||||||
xorl %edx, %edx
|
xorl %edx, %edx
|
||||||
#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
|
#if CONFIG_TINY_BOOTBLOCK
|
||||||
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
||||||
#else
|
#else
|
||||||
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
||||||
|
@ -128,7 +128,7 @@ clear_mtrrs:
|
||||||
movl %eax, %cr0
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Set up the stack pointer. */
|
/* Set up the stack pointer. */
|
||||||
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
#if CONFIG_USBDEBUG
|
||||||
/* 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
|
||||||
|
|
|
@ -109,7 +109,7 @@ clear_mtrrs:
|
||||||
/* Enable cache for our code in Flash because we do XIP here */
|
/* Enable cache for our code in Flash because we do XIP here */
|
||||||
movl $MTRRphysBase_MSR(1), %ecx
|
movl $MTRRphysBase_MSR(1), %ecx
|
||||||
xorl %edx, %edx
|
xorl %edx, %edx
|
||||||
#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
|
#if CONFIG_TINY_BOOTBLOCK
|
||||||
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
||||||
#else
|
#else
|
||||||
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
||||||
|
@ -135,7 +135,7 @@ clear_mtrrs:
|
||||||
movl %eax, %cr0
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Set up the stack pointer. */
|
/* Set up the stack pointer. */
|
||||||
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
#if CONFIG_USBDEBUG
|
||||||
/* 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
|
||||||
|
|
|
@ -110,7 +110,7 @@ clear_fixed_var_mtrr_out:
|
||||||
movl $(~(CacheSize - 1) | MTRRphysMaskValid), %eax
|
movl $(~(CacheSize - 1) | MTRRphysMaskValid), %eax
|
||||||
wrmsr
|
wrmsr
|
||||||
|
|
||||||
#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
|
#if CONFIG_TINY_BOOTBLOCK
|
||||||
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
||||||
#else
|
#else
|
||||||
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
|
||||||
|
|
|
@ -296,7 +296,7 @@ void run_bios(struct device *dev, unsigned long addr)
|
||||||
printk(BIOS_DEBUG, "... Option ROM returned.\n");
|
printk(BIOS_DEBUG, "... Option ROM returned.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_GEODE_VSA) && CONFIG_GEODE_VSA
|
#if CONFIG_GEODE_VSA
|
||||||
#include <cpu/amd/lxdef.h>
|
#include <cpu/amd/lxdef.h>
|
||||||
#include <cpu/amd/vr.h>
|
#include <cpu/amd/vr.h>
|
||||||
#include <cbfs.h>
|
#include <cbfs.h>
|
||||||
|
|
|
@ -58,37 +58,37 @@ biosemu(u8 *biosmem, u32 biosmem_size, struct device * dev, unsigned long rom_ad
|
||||||
int i = 0;
|
int i = 0;
|
||||||
#if CONFIG_X86EMU_DEBUG
|
#if CONFIG_X86EMU_DEBUG
|
||||||
debug_flags = 0;
|
debug_flags = 0;
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_JMP) && CONFIG_X86EMU_DEBUG_JMP
|
#if CONFIG_X86EMU_DEBUG_JMP
|
||||||
debug_flags |= DEBUG_JMP;
|
debug_flags |= DEBUG_JMP;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_TRACE) && CONFIG_X86EMU_DEBUG_TRACE
|
#if CONFIG_X86EMU_DEBUG_TRACE
|
||||||
debug_flags |= DEBUG_TRACE_X86EMU;
|
debug_flags |= DEBUG_TRACE_X86EMU;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_PNP) && CONFIG_X86EMU_DEBUG_PNP
|
#if CONFIG_X86EMU_DEBUG_PNP
|
||||||
debug_flags |= DEBUG_PNP;
|
debug_flags |= DEBUG_PNP;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_DISK) && CONFIG_X86EMU_DEBUG_DISK
|
#if CONFIG_X86EMU_DEBUG_DISK
|
||||||
debug_flags |= DEBUG_DISK;
|
debug_flags |= DEBUG_DISK;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_PMM) && CONFIG_X86EMU_DEBUG_PMM
|
#if CONFIG_X86EMU_DEBUG_PMM
|
||||||
debug_flags |= DEBUG_PMM;
|
debug_flags |= DEBUG_PMM;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_VBE) && CONFIG_X86EMU_DEBUG_VBE
|
#if CONFIG_X86EMU_DEBUG_VBE
|
||||||
debug_flags |= DEBUG_VBE;
|
debug_flags |= DEBUG_VBE;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_INT10) && CONFIG_X86EMU_DEBUG_INT10
|
#if CONFIG_X86EMU_DEBUG_INT10
|
||||||
debug_flags |= DEBUG_PRINT_INT10;
|
debug_flags |= DEBUG_PRINT_INT10;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_INTERRUPTS) && CONFIG_X86EMU_DEBUG_INTERRUPTS
|
#if CONFIG_X86EMU_DEBUG_INTERRUPTS
|
||||||
debug_flags |= DEBUG_INTR;
|
debug_flags |= DEBUG_INTR;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_CHECK_VMEM_ACCESS) && CONFIG_X86EMU_DEBUG_CHECK_VMEM_ACCESS
|
#if CONFIG_X86EMU_DEBUG_CHECK_VMEM_ACCESS
|
||||||
debug_flags |= DEBUG_CHECK_VMEM_ACCESS;
|
debug_flags |= DEBUG_CHECK_VMEM_ACCESS;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_MEM) && CONFIG_X86EMU_DEBUG_MEM
|
#if CONFIG_X86EMU_DEBUG_MEM
|
||||||
debug_flags |= DEBUG_MEM;
|
debug_flags |= DEBUG_MEM;
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_X86EMU_DEBUG_IO) && CONFIG_X86EMU_DEBUG_IO
|
#if CONFIG_X86EMU_DEBUG_IO
|
||||||
debug_flags |= DEBUG_IO;
|
debug_flags |= DEBUG_IO;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -309,7 +309,7 @@ biosemu(u8 *biosmem, u32 biosmem_size, struct device * dev, unsigned long rom_ad
|
||||||
* some boot device status in AX (see PNP BIOS Spec Section 3.3
|
* some boot device status in AX (see PNP BIOS Spec Section 3.3
|
||||||
*/
|
*/
|
||||||
DEBUG_PRINTF_CS_IP("Option ROM Exit Status: %04x\n", M.x86.R_AX);
|
DEBUG_PRINTF_CS_IP("Option ROM Exit Status: %04x\n", M.x86.R_AX);
|
||||||
#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG
|
#if CONFIG_X86EMU_DEBUG
|
||||||
DEBUG_PRINTF("Exit Status Decode:\n");
|
DEBUG_PRINTF("Exit Status Decode:\n");
|
||||||
if (M.x86.R_AX & 0x100) { // bit 8
|
if (M.x86.R_AX & 0x100) { // bit 8
|
||||||
DEBUG_PRINTF
|
DEBUG_PRINTF
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
|
|
||||||
#define VMEM_SIZE (1024 * 1024) /* 1 MB */
|
#define VMEM_SIZE (1024 * 1024) /* 1 MB */
|
||||||
|
|
||||||
#if !defined(CONFIG_YABEL_DIRECTHW) || (!CONFIG_YABEL_DIRECTHW)
|
#if !CONFIG_YABEL_DIRECTHW
|
||||||
#ifdef CONFIG_YABEL_VIRTMEM_LOCATION
|
#if CONFIG_YABEL_VIRTMEM_LOCATION
|
||||||
u8* vmem = (u8 *) CONFIG_YABEL_VIRTMEM_LOCATION;
|
u8* vmem = (u8 *) CONFIG_YABEL_VIRTMEM_LOCATION;
|
||||||
#else
|
#else
|
||||||
u8* vmem = (u8 *) (16*1024*1024); /* default to 16MB */
|
u8* vmem = (u8 *) (16*1024*1024); /* default to 16MB */
|
||||||
|
|
|
@ -66,7 +66,7 @@ static inline void set_ci(void) {};
|
||||||
// set to enable tracing of JMPs in x86emu
|
// set to enable tracing of JMPs in x86emu
|
||||||
#define DEBUG_JMP 0x2000
|
#define DEBUG_JMP 0x2000
|
||||||
|
|
||||||
#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG
|
#if CONFIG_X86EMU_DEBUG
|
||||||
|
|
||||||
#define CHECK_DBG(_flag) if (debug_flags & _flag)
|
#define CHECK_DBG(_flag) if (debug_flags & _flag)
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ typedef struct {
|
||||||
typedef struct {
|
typedef struct {
|
||||||
u8 bus;
|
u8 bus;
|
||||||
u8 devfn;
|
u8 devfn;
|
||||||
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
|
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
|
||||||
struct device* dev;
|
struct device* dev;
|
||||||
#else
|
#else
|
||||||
u64 puid;
|
u64 puid;
|
||||||
|
@ -84,7 +84,7 @@ typedef struct {
|
||||||
} biosemu_device_t;
|
} biosemu_device_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
|
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
|
||||||
unsigned long info;
|
unsigned long info;
|
||||||
#else
|
#else
|
||||||
u8 info;
|
u8 info;
|
||||||
|
|
|
@ -9,7 +9,7 @@ void cpu_initialize(void);
|
||||||
void initialize_cpus(struct bus *cpu_bus);
|
void initialize_cpus(struct bus *cpu_bus);
|
||||||
void secondary_cpu_init(void);
|
void secondary_cpu_init(void);
|
||||||
|
|
||||||
#if !defined(CONFIG_WAIT_BEFORE_CPUS_INIT) || CONFIG_WAIT_BEFORE_CPUS_INIT==0
|
#if !CONFIG_WAIT_BEFORE_CPUS_INIT
|
||||||
#define cpus_ready_for_init() do {} while(0)
|
#define cpus_ready_for_init() do {} while(0)
|
||||||
#else
|
#else
|
||||||
void cpus_ready_for_init(void);
|
void cpus_ready_for_init(void);
|
||||||
|
|
|
@ -69,7 +69,7 @@ void x86_setup_fixed_mtrrs(void);
|
||||||
|
|
||||||
#if !defined (__ASSEMBLER__)
|
#if !defined (__ASSEMBLER__)
|
||||||
#if defined(CONFIG_XIP_ROM_SIZE)
|
#if defined(CONFIG_XIP_ROM_SIZE)
|
||||||
# if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
|
# if CONFIG_TINY_BOOTBLOCK
|
||||||
extern unsigned long AUTO_XIP_ROM_BASE;
|
extern unsigned long AUTO_XIP_ROM_BASE;
|
||||||
# define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
# define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
|
||||||
# else
|
# else
|
||||||
|
|
|
@ -40,7 +40,7 @@ void ram_check(unsigned long start, unsigned long stop);
|
||||||
void quick_ram_check(void);
|
void quick_ram_check(void);
|
||||||
|
|
||||||
/* Defined in romstage.c */
|
/* Defined in romstage.c */
|
||||||
#if defined(CONFIG_CPU_AMD_LX) && CONFIG_CPU_AMD_LX
|
#if CONFIG_CPU_AMD_LX
|
||||||
void cache_as_ram_main(void);
|
void cache_as_ram_main(void);
|
||||||
#else
|
#else
|
||||||
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx);
|
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx);
|
||||||
|
|
|
@ -28,7 +28,7 @@ void set_boot_successful(void)
|
||||||
|
|
||||||
void boot_successful(void)
|
void boot_successful(void)
|
||||||
{
|
{
|
||||||
#if defined(CONFIG_BOOTSPLASH) && CONFIG_BOOTSPLASH && !CONFIG_COREBOOT_KEEP_FRAMEBUFFER
|
#if CONFIG_BOOTSPLASH && !CONFIG_COREBOOT_KEEP_FRAMEBUFFER
|
||||||
void vbe_textmode_console(void);
|
void vbe_textmode_console(void);
|
||||||
|
|
||||||
vbe_textmode_console();
|
vbe_textmode_console();
|
||||||
|
|
|
@ -1111,7 +1111,7 @@ static unsigned long interleave_chip_selects(const struct mem_controller *ctrl,
|
||||||
if (read_option(CMOS_VSTART_interleave_chip_selects, CMOS_VLEN_interleave_chip_selects, 1) == 0)
|
if (read_option(CMOS_VSTART_interleave_chip_selects, CMOS_VLEN_interleave_chip_selects, 1) == 0)
|
||||||
return 0;
|
return 0;
|
||||||
#else
|
#else
|
||||||
#if !defined(CONFIG_INTERLEAVE_CHIP_SELECTS) || (CONFIG_INTERLEAVE_CHIP_SELECTS == 0)
|
#if !CONFIG_INTERLEAVE_CHIP_SELECTS
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -2379,7 +2379,7 @@ static void set_ecc(const struct mem_controller *ctrl,
|
||||||
dcl &= ~DCL_DimmEccEn;
|
dcl &= ~DCL_DimmEccEn;
|
||||||
}
|
}
|
||||||
#else // CMOS_VSTART_ECC_memory not defined
|
#else // CMOS_VSTART_ECC_memory not defined
|
||||||
#if defined(CONFIG_ECC_MEMORY) && (CONFIG_ECC_MEMORY == 0)
|
#if !CONFIG_ECC_MEMORY
|
||||||
dcl &= ~DCL_DimmEccEn;
|
dcl &= ~DCL_DimmEccEn;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <delay.h>
|
#include <delay.h>
|
||||||
#include "cn700.h"
|
#include "cn700.h"
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_RAM_SETUP
|
#if CONFIG_DEBUG_RAM_SETUP
|
||||||
#define PRINT_DEBUG_MEM(x) print_debug(x)
|
#define PRINT_DEBUG_MEM(x) print_debug(x)
|
||||||
#define PRINT_DEBUG_MEM_HEX8(x) print_debug_hex8(x)
|
#define PRINT_DEBUG_MEM_HEX8(x) print_debug_hex8(x)
|
||||||
#define PRINT_DEBUG_MEM_HEX16(x) print_debug_hex16(x)
|
#define PRINT_DEBUG_MEM_HEX16(x) print_debug_hex16(x)
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
|
|
||||||
#define SMBUS_DELAY() outb(0x80, 0x80)
|
#define SMBUS_DELAY() outb(0x80, 0x80)
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_SMBUS
|
#if CONFIG_DEBUG_SMBUS
|
||||||
#define PRINT_DEBUG(x) print_debug(x)
|
#define PRINT_DEBUG(x) print_debug(x)
|
||||||
#define PRINT_DEBUG_HEX16(x) print_debug_hex16(x)
|
#define PRINT_DEBUG_HEX16(x) print_debug_hex16(x)
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -35,7 +35,7 @@ void setup_i8254(void)
|
||||||
outb(0x12, TIMER1_PORT);
|
outb(0x12, TIMER1_PORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_UDELAY_TIMER2
|
#if CONFIG_UDELAY_TIMER2
|
||||||
static void load_timer2(unsigned int ticks)
|
static void load_timer2(unsigned int ticks)
|
||||||
{
|
{
|
||||||
/* Set up the timer gate, turn off the speaker */
|
/* Set up the timer gate, turn off the speaker */
|
||||||
|
|
|
@ -149,7 +149,7 @@ static void sb7xx_51xx_lpc_init(void)
|
||||||
reg32 |= 1 << 20;
|
reg32 |= 1 << 20;
|
||||||
pci_write_config32(dev, 0x64, reg32);
|
pci_write_config32(dev, 0x64, reg32);
|
||||||
|
|
||||||
#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100
|
#if CONFIG_SOUTHBRIDGE_AMD_SP5100
|
||||||
post_code(0x66);
|
post_code(0x66);
|
||||||
dev = pci_locate_device(PCI_ID(0x1002, 0x439d), 0); /* LPC Controller */
|
dev = pci_locate_device(PCI_ID(0x1002, 0x439d), 0); /* LPC Controller */
|
||||||
reg8 = pci_read_config8(dev, 0xBB);
|
reg8 = pci_read_config8(dev, 0xBB);
|
||||||
|
@ -163,7 +163,7 @@ static void sb7xx_51xx_lpc_init(void)
|
||||||
// XXX Serial port decode on LPC is hardcoded to 0x3f8
|
// XXX Serial port decode on LPC is hardcoded to 0x3f8
|
||||||
reg8 = pci_read_config8(dev, 0x44);
|
reg8 = pci_read_config8(dev, 0x44);
|
||||||
reg8 |= 1 << 6;
|
reg8 |= 1 << 6;
|
||||||
#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100
|
#if CONFIG_SOUTHBRIDGE_AMD_SP5100
|
||||||
#if CONFIG_TTYS0_BASE == 0x2f8
|
#if CONFIG_TTYS0_BASE == 0x2f8
|
||||||
reg8 |= 1 << 7;
|
reg8 |= 1 << 7;
|
||||||
#endif
|
#endif
|
||||||
|
@ -369,7 +369,7 @@ static void sb700_devices_por_init(void)
|
||||||
{
|
{
|
||||||
device_t dev;
|
device_t dev;
|
||||||
u8 byte;
|
u8 byte;
|
||||||
#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100
|
#if CONFIG_SOUTHBRIDGE_AMD_SP5100
|
||||||
u32 dword;
|
u32 dword;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -505,7 +505,7 @@ static void sb700_devices_por_init(void)
|
||||||
/* Enable PCIB_DUAL_EN_UP will fix potential problem with PCI cards. */
|
/* Enable PCIB_DUAL_EN_UP will fix potential problem with PCI cards. */
|
||||||
pci_write_config8(dev, 0x50, 0x01);
|
pci_write_config8(dev, 0x50, 0x01);
|
||||||
|
|
||||||
#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100
|
#if CONFIG_SOUTHBRIDGE_AMD_SP5100
|
||||||
/* SP5100 default SATA mode is RAID5 MODE */
|
/* SP5100 default SATA mode is RAID5 MODE */
|
||||||
dev = pci_locate_device(PCI_ID(0x1002, 0x4393), 0);
|
dev = pci_locate_device(PCI_ID(0x1002, 0x4393), 0);
|
||||||
/* Set SATA Operation Mode, Set to IDE mode */
|
/* Set SATA Operation Mode, Set to IDE mode */
|
||||||
|
|
|
@ -63,7 +63,7 @@ static void lpc_init(device_t dev)
|
||||||
/* Disable LPC MSI Capability */
|
/* Disable LPC MSI Capability */
|
||||||
byte = pci_read_config8(dev, 0x78);
|
byte = pci_read_config8(dev, 0x78);
|
||||||
byte &= ~(1 << 1);
|
byte &= ~(1 << 1);
|
||||||
#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100
|
#if CONFIG_SOUTHBRIDGE_AMD_SP5100
|
||||||
/* Disable FlowContrl, Always service the request from Host
|
/* Disable FlowContrl, Always service the request from Host
|
||||||
* whenever there is a request from Host pending
|
* whenever there is a request from Host pending
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -190,7 +190,7 @@ static void sata_init(struct device *dev)
|
||||||
byte |= 7 << 0;
|
byte |= 7 << 0;
|
||||||
pci_write_config8(dev, 0x4, byte);
|
pci_write_config8(dev, 0x4, byte);
|
||||||
|
|
||||||
#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100
|
#if CONFIG_SOUTHBRIDGE_AMD_SP5100
|
||||||
/* Master Latency Timer */
|
/* Master Latency Timer */
|
||||||
pci_write_config32(dev, 0xC, 0x00004000);
|
pci_write_config32(dev, 0xC, 0x00004000);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue