[commit] r6536 - in trunk/src: arch/x86/lib console cpu/amd/car cpu/intel/car cpu/intel/model_106cx cpu/intel/model_6ex cpu/intel/model_6fx cpu/via/car devices/oprom devices/oprom/yabel devices/opr...
Author: stepan Date: Thu Apr 21 22:45:45 2011 New Revision: 6536 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6536
Log: more ifdef -> if fixes Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org Acked-by: Stefan Reinauer stefan.reinauer@coreboot.org
Modified: trunk/src/arch/x86/lib/exception.c trunk/src/arch/x86/lib/ioapic.c trunk/src/console/post.c trunk/src/cpu/amd/car/cache_as_ram.inc trunk/src/cpu/intel/car/cache_as_ram.inc trunk/src/cpu/intel/model_106cx/cache_as_ram.inc trunk/src/cpu/intel/model_6ex/cache_as_ram.inc trunk/src/cpu/intel/model_6fx/cache_as_ram.inc trunk/src/cpu/via/car/cache_as_ram.inc trunk/src/devices/oprom/x86.c trunk/src/devices/oprom/yabel/biosemu.c trunk/src/devices/oprom/yabel/compat/functions.c trunk/src/devices/oprom/yabel/debug.h trunk/src/devices/oprom/yabel/device.h trunk/src/include/cpu/cpu.h trunk/src/include/cpu/x86/mtrr.h trunk/src/include/lib.h trunk/src/lib/fallback_boot.c trunk/src/northbridge/amd/amdk8/raminit_f.c trunk/src/northbridge/via/cn700/raminit.c trunk/src/northbridge/via/vx800/early_smbus.c trunk/src/pc80/i8254.c trunk/src/southbridge/amd/sb700/early_setup.c trunk/src/southbridge/amd/sb700/lpc.c trunk/src/southbridge/amd/sb700/sata.c
Modified: trunk/src/arch/x86/lib/exception.c ============================================================================== --- trunk/src/arch/x86/lib/exception.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/arch/x86/lib/exception.c Thu Apr 21 22:45:45 2011 (r6536) @@ -1,7 +1,7 @@ #include <console/console.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. * At least NUM_REGBYTES*2 are needed for register packets
Modified: trunk/src/arch/x86/lib/ioapic.c ============================================================================== --- trunk/src/arch/x86/lib/ioapic.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/arch/x86/lib/ioapic.c Thu Apr 21 22:45:45 2011 (r6536) @@ -91,7 +91,7 @@
// XXX this decision should probably be made elsewhere, and // 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 #else #define IOAPIC_INTERRUPTS_ON_FSB
Modified: trunk/src/console/post.c ============================================================================== --- trunk/src/console/post.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/console/post.c Thu Apr 21 22:45:45 2011 (r6536) @@ -26,8 +26,8 @@
void post_code(uint8_t value) { -#if !defined(CONFIG_NO_POST) || CONFIG_NO_POST==0 -#if CONFIG_CONSOLE_POST==1 +#if !CONFIG_NO_POST +#if CONFIG_CONSOLE_POST print_emerg("POST: 0x"); print_emerg_hex8(value); print_emerg("\n");
Modified: trunk/src/cpu/amd/car/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/amd/car/cache_as_ram.inc Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/cpu/amd/car/cache_as_ram.inc Thu Apr 21 22:45:45 2011 (r6536) @@ -281,7 +281,7 @@
#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 #else #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
Modified: trunk/src/cpu/intel/car/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/intel/car/cache_as_ram.inc Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/cpu/intel/car/cache_as_ram.inc Thu Apr 21 22:45:45 2011 (r6536) @@ -231,7 +231,7 @@
#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 #else #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
Modified: trunk/src/cpu/intel/model_106cx/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/intel/model_106cx/cache_as_ram.inc Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/cpu/intel/model_106cx/cache_as_ram.inc Thu Apr 21 22:45:45 2011 (r6536) @@ -102,7 +102,7 @@ /* Enable cache for our code in Flash because we do XIP here */ movl $MTRRphysBase_MSR(1), %ecx xorl %edx, %edx -#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK +#if CONFIG_TINY_BOOTBLOCK #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE #else #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE @@ -128,7 +128,7 @@ movl %eax, %cr0
/* Set up the stack pointer. */ -#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) +#if CONFIG_USBDEBUG /* Leave some space for the struct ehci_debug_info. */ movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax #else
Modified: trunk/src/cpu/intel/model_6ex/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/intel/model_6ex/cache_as_ram.inc Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/cpu/intel/model_6ex/cache_as_ram.inc Thu Apr 21 22:45:45 2011 (r6536) @@ -102,7 +102,7 @@ /* Enable cache for our code in Flash because we do XIP here */ movl $MTRRphysBase_MSR(1), %ecx xorl %edx, %edx -#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK +#if CONFIG_TINY_BOOTBLOCK #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE #else #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE @@ -128,7 +128,7 @@ movl %eax, %cr0
/* Set up the stack pointer. */ -#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) +#if CONFIG_USBDEBUG /* Leave some space for the struct ehci_debug_info. */ movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax #else
Modified: trunk/src/cpu/intel/model_6fx/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/intel/model_6fx/cache_as_ram.inc Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/cpu/intel/model_6fx/cache_as_ram.inc Thu Apr 21 22:45:45 2011 (r6536) @@ -109,7 +109,7 @@ /* Enable cache for our code in Flash because we do XIP here */ movl $MTRRphysBase_MSR(1), %ecx xorl %edx, %edx -#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK +#if CONFIG_TINY_BOOTBLOCK #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE #else #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE @@ -135,7 +135,7 @@ movl %eax, %cr0
/* Set up the stack pointer. */ -#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) +#if CONFIG_USBDEBUG /* Leave some space for the struct ehci_debug_info. */ movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax #else
Modified: trunk/src/cpu/via/car/cache_as_ram.inc ============================================================================== --- trunk/src/cpu/via/car/cache_as_ram.inc Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/cpu/via/car/cache_as_ram.inc Thu Apr 21 22:45:45 2011 (r6536) @@ -110,7 +110,7 @@ movl $(~(CacheSize - 1) | MTRRphysMaskValid), %eax wrmsr
-#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK +#if CONFIG_TINY_BOOTBLOCK #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE #else #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
Modified: trunk/src/devices/oprom/x86.c ============================================================================== --- trunk/src/devices/oprom/x86.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/devices/oprom/x86.c Thu Apr 21 22:45:45 2011 (r6536) @@ -296,7 +296,7 @@ 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/vr.h> #include <cbfs.h>
Modified: trunk/src/devices/oprom/yabel/biosemu.c ============================================================================== --- trunk/src/devices/oprom/yabel/biosemu.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/devices/oprom/yabel/biosemu.c Thu Apr 21 22:45:45 2011 (r6536) @@ -58,37 +58,37 @@ int i = 0; #if CONFIG_X86EMU_DEBUG debug_flags = 0; -#if defined(CONFIG_X86EMU_DEBUG_JMP) && CONFIG_X86EMU_DEBUG_JMP +#if CONFIG_X86EMU_DEBUG_JMP debug_flags |= DEBUG_JMP; #endif -#if defined(CONFIG_X86EMU_DEBUG_TRACE) && CONFIG_X86EMU_DEBUG_TRACE +#if CONFIG_X86EMU_DEBUG_TRACE debug_flags |= DEBUG_TRACE_X86EMU; #endif -#if defined(CONFIG_X86EMU_DEBUG_PNP) && CONFIG_X86EMU_DEBUG_PNP +#if CONFIG_X86EMU_DEBUG_PNP debug_flags |= DEBUG_PNP; #endif -#if defined(CONFIG_X86EMU_DEBUG_DISK) && CONFIG_X86EMU_DEBUG_DISK +#if CONFIG_X86EMU_DEBUG_DISK debug_flags |= DEBUG_DISK; #endif -#if defined(CONFIG_X86EMU_DEBUG_PMM) && CONFIG_X86EMU_DEBUG_PMM +#if CONFIG_X86EMU_DEBUG_PMM debug_flags |= DEBUG_PMM; #endif -#if defined(CONFIG_X86EMU_DEBUG_VBE) && CONFIG_X86EMU_DEBUG_VBE +#if CONFIG_X86EMU_DEBUG_VBE debug_flags |= DEBUG_VBE; #endif -#if defined(CONFIG_X86EMU_DEBUG_INT10) && CONFIG_X86EMU_DEBUG_INT10 +#if CONFIG_X86EMU_DEBUG_INT10 debug_flags |= DEBUG_PRINT_INT10; #endif -#if defined(CONFIG_X86EMU_DEBUG_INTERRUPTS) && CONFIG_X86EMU_DEBUG_INTERRUPTS +#if CONFIG_X86EMU_DEBUG_INTERRUPTS debug_flags |= DEBUG_INTR; #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; #endif -#if defined(CONFIG_X86EMU_DEBUG_MEM) && CONFIG_X86EMU_DEBUG_MEM +#if CONFIG_X86EMU_DEBUG_MEM debug_flags |= DEBUG_MEM; #endif -#if defined(CONFIG_X86EMU_DEBUG_IO) && CONFIG_X86EMU_DEBUG_IO +#if CONFIG_X86EMU_DEBUG_IO debug_flags |= DEBUG_IO; #endif
@@ -309,7 +309,7 @@ * 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); -#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG +#if CONFIG_X86EMU_DEBUG DEBUG_PRINTF("Exit Status Decode:\n"); if (M.x86.R_AX & 0x100) { // bit 8 DEBUG_PRINTF
Modified: trunk/src/devices/oprom/yabel/compat/functions.c ============================================================================== --- trunk/src/devices/oprom/yabel/compat/functions.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/devices/oprom/yabel/compat/functions.c Thu Apr 21 22:45:45 2011 (r6536) @@ -23,8 +23,8 @@
#define VMEM_SIZE (1024 * 1024) /* 1 MB */
-#if !defined(CONFIG_YABEL_DIRECTHW) || (!CONFIG_YABEL_DIRECTHW) -#ifdef CONFIG_YABEL_VIRTMEM_LOCATION +#if !CONFIG_YABEL_DIRECTHW +#if CONFIG_YABEL_VIRTMEM_LOCATION u8* vmem = (u8 *) CONFIG_YABEL_VIRTMEM_LOCATION; #else u8* vmem = (u8 *) (16*1024*1024); /* default to 16MB */
Modified: trunk/src/devices/oprom/yabel/debug.h ============================================================================== --- trunk/src/devices/oprom/yabel/debug.h Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/devices/oprom/yabel/debug.h Thu Apr 21 22:45:45 2011 (r6536) @@ -66,7 +66,7 @@ // set to enable tracing of JMPs in x86emu #define DEBUG_JMP 0x2000
-#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG +#if CONFIG_X86EMU_DEBUG
#define CHECK_DBG(_flag) if (debug_flags & _flag)
Modified: trunk/src/devices/oprom/yabel/device.h ============================================================================== --- trunk/src/devices/oprom/yabel/device.h Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/devices/oprom/yabel/device.h Thu Apr 21 22:45:45 2011 (r6536) @@ -62,7 +62,7 @@ typedef struct { u8 bus; u8 devfn; -#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL +#if CONFIG_PCI_OPTION_ROM_RUN_YABEL struct device* dev; #else u64 puid; @@ -84,7 +84,7 @@ } biosemu_device_t;
typedef struct { -#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL +#if CONFIG_PCI_OPTION_ROM_RUN_YABEL unsigned long info; #else u8 info;
Modified: trunk/src/include/cpu/cpu.h ============================================================================== --- trunk/src/include/cpu/cpu.h Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/include/cpu/cpu.h Thu Apr 21 22:45:45 2011 (r6536) @@ -9,7 +9,7 @@ void initialize_cpus(struct bus *cpu_bus); 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) #else void cpus_ready_for_init(void);
Modified: trunk/src/include/cpu/x86/mtrr.h ============================================================================== --- trunk/src/include/cpu/x86/mtrr.h Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/include/cpu/x86/mtrr.h Thu Apr 21 22:45:45 2011 (r6536) @@ -69,7 +69,7 @@
#if !defined (__ASSEMBLER__) #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; # define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE # else
Modified: trunk/src/include/lib.h ============================================================================== --- trunk/src/include/lib.h Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/include/lib.h Thu Apr 21 22:45:45 2011 (r6536) @@ -40,7 +40,7 @@ void quick_ram_check(void);
/* 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); #else void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx);
Modified: trunk/src/lib/fallback_boot.c ============================================================================== --- trunk/src/lib/fallback_boot.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/lib/fallback_boot.c Thu Apr 21 22:45:45 2011 (r6536) @@ -28,7 +28,7 @@
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);
vbe_textmode_console();
Modified: trunk/src/northbridge/amd/amdk8/raminit_f.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/raminit_f.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/northbridge/amd/amdk8/raminit_f.c Thu Apr 21 22:45:45 2011 (r6536) @@ -1111,7 +1111,7 @@ if (read_option(CMOS_VSTART_interleave_chip_selects, CMOS_VLEN_interleave_chip_selects, 1) == 0) return 0; #else -#if !defined(CONFIG_INTERLEAVE_CHIP_SELECTS) || (CONFIG_INTERLEAVE_CHIP_SELECTS == 0) +#if !CONFIG_INTERLEAVE_CHIP_SELECTS return 0; #endif #endif @@ -2379,7 +2379,7 @@ dcl &= ~DCL_DimmEccEn; } #else // CMOS_VSTART_ECC_memory not defined -#if defined(CONFIG_ECC_MEMORY) && (CONFIG_ECC_MEMORY == 0) +#if !CONFIG_ECC_MEMORY dcl &= ~DCL_DimmEccEn; #endif #endif
Modified: trunk/src/northbridge/via/cn700/raminit.c ============================================================================== --- trunk/src/northbridge/via/cn700/raminit.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/northbridge/via/cn700/raminit.c Thu Apr 21 22:45:45 2011 (r6536) @@ -24,7 +24,7 @@ #include <delay.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_HEX8(x) print_debug_hex8(x) #define PRINT_DEBUG_MEM_HEX16(x) print_debug_hex16(x)
Modified: trunk/src/northbridge/via/vx800/early_smbus.c ============================================================================== --- trunk/src/northbridge/via/vx800/early_smbus.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/northbridge/via/vx800/early_smbus.c Thu Apr 21 22:45:45 2011 (r6536) @@ -49,7 +49,7 @@
#define SMBUS_DELAY() outb(0x80, 0x80)
-#ifdef CONFIG_DEBUG_SMBUS +#if CONFIG_DEBUG_SMBUS #define PRINT_DEBUG(x) print_debug(x) #define PRINT_DEBUG_HEX16(x) print_debug_hex16(x) #else
Modified: trunk/src/pc80/i8254.c ============================================================================== --- trunk/src/pc80/i8254.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/pc80/i8254.c Thu Apr 21 22:45:45 2011 (r6536) @@ -35,7 +35,7 @@ outb(0x12, TIMER1_PORT); }
-#ifdef CONFIG_UDELAY_TIMER2 +#if CONFIG_UDELAY_TIMER2 static void load_timer2(unsigned int ticks) { /* Set up the timer gate, turn off the speaker */
Modified: trunk/src/southbridge/amd/sb700/early_setup.c ============================================================================== --- trunk/src/southbridge/amd/sb700/early_setup.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/southbridge/amd/sb700/early_setup.c Thu Apr 21 22:45:45 2011 (r6536) @@ -149,7 +149,7 @@ reg32 |= 1 << 20; pci_write_config32(dev, 0x64, reg32);
-#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 +#if CONFIG_SOUTHBRIDGE_AMD_SP5100 post_code(0x66); dev = pci_locate_device(PCI_ID(0x1002, 0x439d), 0); /* LPC Controller */ reg8 = pci_read_config8(dev, 0xBB); @@ -163,7 +163,7 @@ // XXX Serial port decode on LPC is hardcoded to 0x3f8 reg8 = pci_read_config8(dev, 0x44); reg8 |= 1 << 6; -#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 +#if CONFIG_SOUTHBRIDGE_AMD_SP5100 #if CONFIG_TTYS0_BASE == 0x2f8 reg8 |= 1 << 7; #endif @@ -369,7 +369,7 @@ { device_t dev; u8 byte; -#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 +#if CONFIG_SOUTHBRIDGE_AMD_SP5100 u32 dword; #endif
@@ -505,7 +505,7 @@ /* Enable PCIB_DUAL_EN_UP will fix potential problem with PCI cards. */ pci_write_config8(dev, 0x50, 0x01);
-#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 +#if CONFIG_SOUTHBRIDGE_AMD_SP5100 /* SP5100 default SATA mode is RAID5 MODE */ dev = pci_locate_device(PCI_ID(0x1002, 0x4393), 0); /* Set SATA Operation Mode, Set to IDE mode */
Modified: trunk/src/southbridge/amd/sb700/lpc.c ============================================================================== --- trunk/src/southbridge/amd/sb700/lpc.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/southbridge/amd/sb700/lpc.c Thu Apr 21 22:45:45 2011 (r6536) @@ -63,7 +63,7 @@ /* Disable LPC MSI Capability */ byte = pci_read_config8(dev, 0x78); byte &= ~(1 << 1); -#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 +#if CONFIG_SOUTHBRIDGE_AMD_SP5100 /* Disable FlowContrl, Always service the request from Host * whenever there is a request from Host pending */
Modified: trunk/src/southbridge/amd/sb700/sata.c ============================================================================== --- trunk/src/southbridge/amd/sb700/sata.c Thu Apr 21 22:24:43 2011 (r6535) +++ trunk/src/southbridge/amd/sb700/sata.c Thu Apr 21 22:45:45 2011 (r6536) @@ -190,7 +190,7 @@ byte |= 7 << 0; pci_write_config8(dev, 0x4, byte);
-#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 +#if CONFIG_SOUTHBRIDGE_AMD_SP5100 /* Master Latency Timer */ pci_write_config32(dev, 0xC, 0x00004000); #endif
-
repository service