diff options
author | Myles Watson <mylesgw@gmail.com> | 2009-10-19 16:21:30 +0000 |
---|---|---|
committer | Myles Watson <mylesgw@gmail.com> | 2009-10-19 16:21:30 +0000 |
commit | ec0ee64da7aa7e569da7d55ef86804d9b7fbea1b (patch) | |
tree | b90a7f3399c77007c9fc80bc9ff475dd3ff65dad /src/southbridge | |
parent | a29ad5cb09c1fd983bbace35185148630c62de5d (diff) | |
download | coreboot-staging-ec0ee64da7aa7e569da7d55ef86804d9b7fbea1b.zip coreboot-staging-ec0ee64da7aa7e569da7d55ef86804d9b7fbea1b.tar.gz |
Clean up some #ifdef CONFIG_*
Change HAVE_FAN_CTL to be specific to the SuperIO that supports it.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4809 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/southbridge')
-rw-r--r-- | src/southbridge/via/vt8237r/vt8237r_ide.c | 2 | ||||
-rw-r--r-- | src/southbridge/via/vt8237r/vt8237r_lpc.c | 22 | ||||
-rw-r--r-- | src/southbridge/via/vt8237r/vt8237r_nic.c | 2 | ||||
-rw-r--r-- | src/southbridge/via/vt8237r/vt8237r_usb.c | 10 |
4 files changed, 18 insertions, 18 deletions
diff --git a/src/southbridge/via/vt8237r/vt8237r_ide.c b/src/southbridge/via/vt8237r/vt8237r_ide.c index acec09e..6a4ca38 100644 --- a/src/southbridge/via/vt8237r/vt8237r_ide.c +++ b/src/southbridge/via/vt8237r/vt8237r_ide.c @@ -97,7 +97,7 @@ static void ide_init(struct device *dev) (sb->ide1_80pin_cable << 4); pci_write_config32(dev, IDE_UDMA, cablesel); -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT /* Set PATA Output Drive Strength */ lpc_dev = dev_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT8237R_LPC, 0); diff --git a/src/southbridge/via/vt8237r/vt8237r_lpc.c b/src/southbridge/via/vt8237r/vt8237r_lpc.c index 0b5f194..21dc121 100644 --- a/src/southbridge/via/vt8237r/vt8237r_lpc.c +++ b/src/southbridge/via/vt8237r/vt8237r_lpc.c @@ -51,7 +51,7 @@ extern void dump_south(device_t dev); static void southbridge_init_common(struct device *dev); -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT /* Interrupts for INT# A B C D */ static const unsigned char pciIrqs[4] = { 10, 11, 12, 0}; @@ -119,7 +119,7 @@ static void setup_ioapic(u32 ioapic_base) ioapic_table[0].value_high = (lapicid()) << (56 - 32); l = (u32 *)ioapic_base; -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT /* Set APIC to APIC Serial bus. */ l[0] = 0x3; l[4] = 0; @@ -157,7 +157,7 @@ static void setup_ioapic(u32 ioapic_base) /** Set up PCI IRQ routing, route everything through APIC. */ static void pci_routing_fixup(struct device *dev) { -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT device_t pdev; u8 reg; #endif @@ -171,7 +171,7 @@ static void pci_routing_fixup(struct device *dev) /* Gate Interrupts until RAM Writes are flushed */ pci_write_config8(dev, 0x49, 0x20); -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT /* Share INTE-INTH with INTA-INTD as per stock BIOS. */ pci_write_config8(dev, 0x46, 0x00); @@ -256,7 +256,7 @@ static void setup_pm(device_t dev) /* Set ACPI to 9, must set IRQ 9 override to level! Set PSON gating. */ pci_write_config8(dev, 0x82, 0x40 | VT8237R_ACPI_IRQ); -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT /* Primary interupt channel, define wake events 0=IRQ0 15=IRQ15 1=en. */ pci_write_config16(dev, 0x84, 0x3052); #else @@ -288,7 +288,7 @@ static void setup_pm(device_t dev) * 0 = USB Wakeup */ -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT pci_write_config8(dev, 0x95, 0xc2); #else pci_write_config8(dev, 0x95, 0xcc); @@ -343,7 +343,7 @@ static void vt8237r_init(struct device *dev) { u8 enables, reg8; -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT printk_spew("Entering vt8237r_init, for EPIA.\n"); /* * TODO: Looks like stock BIOS can do this but causes a hang @@ -386,7 +386,7 @@ static void vt8237r_init(struct device *dev) enables |= 0x08; pci_write_config8(dev, 0x4f, enables); -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT /* * Set Read Pass Write Control Enable */ @@ -401,7 +401,7 @@ static void vt8237r_init(struct device *dev) southbridge_init_common(dev); -#ifndef CONFIG_EPIA_VT8237R_INIT +#if !CONFIG_EPIA_VT8237R_INIT /* FIXME: Intel needs more bit set for C2/C3. */ /* @@ -460,7 +460,7 @@ static void vt8237_common_init(struct device *dev) pci_write_config8(dev, PCI_COMMAND, byte); /* EPIA-N(L) Uses CN400 for BIOS Access */ -#ifndef CONFIG_EPIA_VT8237R_INIT +#if !CONFIG_EPIA_VT8237R_INIT /* Enable the internal I/O decode. */ enables = pci_read_config8(dev, 0x6C); enables |= 0x80; @@ -499,7 +499,7 @@ static void vt8237_common_init(struct device *dev) /* Delay transaction control */ pci_write_config8(dev, 0x43, 0xb); -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT /* I/O recovery time, default IDE routing */ pci_write_config8(dev, 0x4c, 0x04); diff --git a/src/southbridge/via/vt8237r/vt8237r_nic.c b/src/southbridge/via/vt8237r/vt8237r_nic.c index 9f61808..3ab0651 100644 --- a/src/southbridge/via/vt8237r/vt8237r_nic.c +++ b/src/southbridge/via/vt8237r/vt8237r_nic.c @@ -27,7 +27,7 @@ static void vt8237_eth_read_resources(struct device *dev) { -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT struct resource *res; /* Fix the I/O Resources of the USB2.0 Interface */ diff --git a/src/southbridge/via/vt8237r/vt8237r_usb.c b/src/southbridge/via/vt8237r/vt8237r_usb.c index bc4c34f..852facd 100644 --- a/src/southbridge/via/vt8237r/vt8237r_usb.c +++ b/src/southbridge/via/vt8237r/vt8237r_usb.c @@ -24,14 +24,14 @@ #include <device/pci_ids.h> #include "vt8237r.h" -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT u32 usb_io_addr[4] = {0xcc00, 0xd000, 0xd400, 0xd800}; #endif static void usb_i_init(struct device *dev) { -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT u8 reg8; printk_debug("Entering %s\n", __func__); @@ -70,7 +70,7 @@ static void usb_i_init(struct device *dev) static void vt8237_usb_i_read_resources(struct device *dev) { -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT struct resource *res; u8 function = (u8) dev->path.pci.devfn & 0x7; @@ -95,7 +95,7 @@ static void vt8237_usb_i_read_resources(struct device *dev) static void usb_ii_init(struct device *dev) { -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT u8 reg8; printk_debug("Entering %s\n", __func__); @@ -117,7 +117,7 @@ static void usb_ii_init(struct device *dev) static void vt8237_usb_ii_read_resources(struct device *dev) { -#ifdef CONFIG_EPIA_VT8237R_INIT +#if CONFIG_EPIA_VT8237R_INIT struct resource *res; /* Fix the I/O Resources of the USB2.0 Interface */ |