summaryrefslogtreecommitdiff
path: root/src/southbridge/intel
diff options
context:
space:
mode:
Diffstat (limited to 'src/southbridge/intel')
-rw-r--r--src/southbridge/intel/esb6300/Makefile.inc22
-rw-r--r--src/southbridge/intel/esb6300/ac97.c (renamed from src/southbridge/intel/esb6300/esb6300_ac97.c)0
-rw-r--r--src/southbridge/intel/esb6300/bridge1c.c (renamed from src/southbridge/intel/esb6300/esb6300_bridge1c.c)0
-rw-r--r--src/southbridge/intel/esb6300/early_smbus.c (renamed from src/southbridge/intel/esb6300/esb6300_early_smbus.c)2
-rw-r--r--src/southbridge/intel/esb6300/ehci.c (renamed from src/southbridge/intel/esb6300/esb6300_ehci.c)0
-rw-r--r--src/southbridge/intel/esb6300/ide.c (renamed from src/southbridge/intel/esb6300/esb6300_ide.c)0
-rw-r--r--src/southbridge/intel/esb6300/lpc.c (renamed from src/southbridge/intel/esb6300/esb6300_lpc.c)0
-rw-r--r--src/southbridge/intel/esb6300/pci.c (renamed from src/southbridge/intel/esb6300/esb6300_pci.c)0
-rw-r--r--src/southbridge/intel/esb6300/pic.c (renamed from src/southbridge/intel/esb6300/esb6300_pic.c)0
-rw-r--r--src/southbridge/intel/esb6300/reset.c (renamed from src/southbridge/intel/esb6300/esb6300_reset.c)0
-rw-r--r--src/southbridge/intel/esb6300/sata.c (renamed from src/southbridge/intel/esb6300/esb6300_sata.c)0
-rw-r--r--src/southbridge/intel/esb6300/smbus.c (renamed from src/southbridge/intel/esb6300/esb6300_smbus.c)2
-rw-r--r--src/southbridge/intel/esb6300/smbus.h (renamed from src/southbridge/intel/esb6300/esb6300_smbus.h)0
-rw-r--r--src/southbridge/intel/esb6300/uhci.c (renamed from src/southbridge/intel/esb6300/esb6300_uhci.c)0
-rw-r--r--src/southbridge/intel/i3100/Makefile.inc16
-rw-r--r--src/southbridge/intel/i3100/early_lpc.c (renamed from src/southbridge/intel/i3100/i3100_early_lpc.c)0
-rw-r--r--src/southbridge/intel/i3100/early_smbus.c (renamed from src/southbridge/intel/i3100/i3100_early_smbus.c)2
-rw-r--r--src/southbridge/intel/i3100/ehci.c (renamed from src/southbridge/intel/i3100/i3100_ehci.c)0
-rw-r--r--src/southbridge/intel/i3100/lpc.c (renamed from src/southbridge/intel/i3100/i3100_lpc.c)0
-rw-r--r--src/southbridge/intel/i3100/pci.c (renamed from src/southbridge/intel/i3100/i3100_pci.c)0
-rw-r--r--src/southbridge/intel/i3100/pciexp_portb.c (renamed from src/southbridge/intel/i3100/i3100_pciexp_portb.c)0
-rw-r--r--src/southbridge/intel/i3100/reset.c (renamed from src/southbridge/intel/i3100/i3100_reset.c)0
-rw-r--r--src/southbridge/intel/i3100/sata.c (renamed from src/southbridge/intel/i3100/i3100_sata.c)0
-rw-r--r--src/southbridge/intel/i3100/smbus.c (renamed from src/southbridge/intel/i3100/i3100_smbus.c)2
-rw-r--r--src/southbridge/intel/i3100/smbus.h (renamed from src/southbridge/intel/i3100/i3100_smbus.h)0
-rw-r--r--src/southbridge/intel/i3100/uhci.c (renamed from src/southbridge/intel/i3100/i3100_uhci.c)0
-rw-r--r--src/southbridge/intel/i82371eb/Makefile.inc16
-rw-r--r--src/southbridge/intel/i82371eb/bootblock.c2
-rw-r--r--src/southbridge/intel/i82371eb/early_pm.c (renamed from src/southbridge/intel/i82371eb/i82371eb_early_pm.c)0
-rw-r--r--src/southbridge/intel/i82371eb/early_smbus.c (renamed from src/southbridge/intel/i82371eb/i82371eb_early_smbus.c)2
-rw-r--r--src/southbridge/intel/i82371eb/enable_rom.c (renamed from src/southbridge/intel/i82371eb/i82371eb_enable_rom.c)0
-rw-r--r--src/southbridge/intel/i82371eb/fadt.c (renamed from src/southbridge/intel/i82371eb/i82371eb_fadt.c)0
-rw-r--r--src/southbridge/intel/i82371eb/ide.c (renamed from src/southbridge/intel/i82371eb/i82371eb_ide.c)0
-rw-r--r--src/southbridge/intel/i82371eb/isa.c (renamed from src/southbridge/intel/i82371eb/i82371eb_isa.c)0
-rw-r--r--src/southbridge/intel/i82371eb/reset.c (renamed from src/southbridge/intel/i82371eb/i82371eb_reset.c)0
-rw-r--r--src/southbridge/intel/i82371eb/smbus.c (renamed from src/southbridge/intel/i82371eb/i82371eb_smbus.c)2
-rw-r--r--src/southbridge/intel/i82371eb/smbus.h (renamed from src/southbridge/intel/i82371eb/i82371eb_smbus.h)0
-rw-r--r--src/southbridge/intel/i82371eb/usb.c (renamed from src/southbridge/intel/i82371eb/i82371eb_usb.c)0
-rw-r--r--src/southbridge/intel/i82801ax/Makefile.inc18
-rw-r--r--src/southbridge/intel/i82801ax/ac97.c (renamed from src/southbridge/intel/i82801ax/i82801ax_ac97.c)0
-rw-r--r--src/southbridge/intel/i82801ax/early_smbus.c (renamed from src/southbridge/intel/i82801ax/i82801ax_early_smbus.c)2
-rw-r--r--src/southbridge/intel/i82801ax/ide.c (renamed from src/southbridge/intel/i82801ax/i82801ax_ide.c)0
-rw-r--r--src/southbridge/intel/i82801ax/lpc.c (renamed from src/southbridge/intel/i82801ax/i82801ax_lpc.c)0
-rw-r--r--src/southbridge/intel/i82801ax/pci.c (renamed from src/southbridge/intel/i82801ax/i82801ax_pci.c)0
-rw-r--r--src/southbridge/intel/i82801ax/reset.c (renamed from src/southbridge/intel/i82801ax/i82801ax_reset.c)0
-rw-r--r--src/southbridge/intel/i82801ax/smbus.c (renamed from src/southbridge/intel/i82801ax/i82801ax_smbus.c)2
-rw-r--r--src/southbridge/intel/i82801ax/smbus.h (renamed from src/southbridge/intel/i82801ax/i82801ax_smbus.h)0
-rw-r--r--src/southbridge/intel/i82801ax/usb.c (renamed from src/southbridge/intel/i82801ax/i82801ax_usb.c)0
-rw-r--r--src/southbridge/intel/i82801ax/watchdog.c (renamed from src/southbridge/intel/i82801ax/i82801ax_watchdog.c)0
-rw-r--r--src/southbridge/intel/i82801bx/Makefile.inc20
-rw-r--r--src/southbridge/intel/i82801bx/ac97.c (renamed from src/southbridge/intel/i82801bx/i82801bx_ac97.c)0
-rw-r--r--src/southbridge/intel/i82801bx/early_smbus.c (renamed from src/southbridge/intel/i82801bx/i82801bx_early_smbus.c)2
-rw-r--r--src/southbridge/intel/i82801bx/ide.c (renamed from src/southbridge/intel/i82801bx/i82801bx_ide.c)0
-rw-r--r--src/southbridge/intel/i82801bx/lpc.c (renamed from src/southbridge/intel/i82801bx/i82801bx_lpc.c)0
-rw-r--r--src/southbridge/intel/i82801bx/nic.c (renamed from src/southbridge/intel/i82801bx/i82801bx_nic.c)0
-rw-r--r--src/southbridge/intel/i82801bx/pci.c (renamed from src/southbridge/intel/i82801bx/i82801bx_pci.c)0
-rw-r--r--src/southbridge/intel/i82801bx/reset.c (renamed from src/southbridge/intel/i82801bx/i82801bx_reset.c)0
-rw-r--r--src/southbridge/intel/i82801bx/smbus.c (renamed from src/southbridge/intel/i82801bx/i82801bx_smbus.c)2
-rw-r--r--src/southbridge/intel/i82801bx/smbus.h (renamed from src/southbridge/intel/i82801bx/i82801bx_smbus.h)0
-rw-r--r--src/southbridge/intel/i82801bx/usb.c (renamed from src/southbridge/intel/i82801bx/i82801bx_usb.c)0
-rw-r--r--src/southbridge/intel/i82801bx/watchdog.c (renamed from src/southbridge/intel/i82801bx/i82801bx_watchdog.c)0
-rw-r--r--src/southbridge/intel/i82801cx/Makefile.inc14
-rw-r--r--src/southbridge/intel/i82801cx/ac97.c (renamed from src/southbridge/intel/i82801cx/i82801cx_ac97.c)0
-rw-r--r--src/southbridge/intel/i82801cx/early_smbus.c (renamed from src/southbridge/intel/i82801cx/i82801cx_early_smbus.c)0
-rw-r--r--src/southbridge/intel/i82801cx/ide.c (renamed from src/southbridge/intel/i82801cx/i82801cx_ide.c)0
-rw-r--r--src/southbridge/intel/i82801cx/lpc.c (renamed from src/southbridge/intel/i82801cx/i82801cx_lpc.c)0
-rw-r--r--src/southbridge/intel/i82801cx/nic.c (renamed from src/southbridge/intel/i82801cx/i82801cx_nic.c)0
-rw-r--r--src/southbridge/intel/i82801cx/pci.c (renamed from src/southbridge/intel/i82801cx/i82801cx_pci.c)0
-rw-r--r--src/southbridge/intel/i82801cx/reset.c (renamed from src/southbridge/intel/i82801cx/i82801cx_reset.c)0
-rw-r--r--src/southbridge/intel/i82801cx/smbus.c (renamed from src/southbridge/intel/i82801cx/i82801cx_smbus.c)0
-rw-r--r--src/southbridge/intel/i82801cx/usb.c (renamed from src/southbridge/intel/i82801cx/i82801cx_usb.c)0
-rw-r--r--src/southbridge/intel/i82801dx/Makefile.inc18
-rw-r--r--src/southbridge/intel/i82801dx/ac97.c (renamed from src/southbridge/intel/i82801dx/i82801dx_ac97.c)0
-rw-r--r--src/southbridge/intel/i82801dx/early_smbus.c (renamed from src/southbridge/intel/i82801dx/i82801dx_early_smbus.c)0
-rw-r--r--src/southbridge/intel/i82801dx/ide.c (renamed from src/southbridge/intel/i82801dx/i82801dx_ide.c)0
-rw-r--r--src/southbridge/intel/i82801dx/lpc.c (renamed from src/southbridge/intel/i82801dx/i82801dx_lpc.c)0
-rw-r--r--src/southbridge/intel/i82801dx/nvs.h (renamed from src/southbridge/intel/i82801dx/i82801dx_nvs.h)0
-rw-r--r--src/southbridge/intel/i82801dx/pci.c (renamed from src/southbridge/intel/i82801dx/i82801dx_pci.c)0
-rw-r--r--src/southbridge/intel/i82801dx/reset.c (renamed from src/southbridge/intel/i82801dx/i82801dx_reset.c)0
-rw-r--r--src/southbridge/intel/i82801dx/smbus.c (renamed from src/southbridge/intel/i82801dx/i82801dx_smbus.c)0
-rw-r--r--src/southbridge/intel/i82801dx/smi.c (renamed from src/southbridge/intel/i82801dx/i82801dx_smi.c)0
-rw-r--r--src/southbridge/intel/i82801dx/smihandler.c (renamed from src/southbridge/intel/i82801dx/i82801dx_smihandler.c)2
-rw-r--r--src/southbridge/intel/i82801dx/tco_timer.c (renamed from src/southbridge/intel/i82801dx/i82801dx_tco_timer.c)0
-rw-r--r--src/southbridge/intel/i82801dx/usb.c (renamed from src/southbridge/intel/i82801dx/i82801dx_usb.c)0
-rw-r--r--src/southbridge/intel/i82801dx/usb2.c (renamed from src/southbridge/intel/i82801dx/i82801dx_usb2.c)0
-rw-r--r--src/southbridge/intel/i82801ex/Makefile.inc20
-rw-r--r--src/southbridge/intel/i82801ex/ac97.c (renamed from src/southbridge/intel/i82801ex/i82801ex_ac97.c)0
-rw-r--r--src/southbridge/intel/i82801ex/early_smbus.c (renamed from src/southbridge/intel/i82801ex/i82801ex_early_smbus.c)2
-rw-r--r--src/southbridge/intel/i82801ex/ehci.c (renamed from src/southbridge/intel/i82801ex/i82801ex_ehci.c)0
-rw-r--r--src/southbridge/intel/i82801ex/ide.c (renamed from src/southbridge/intel/i82801ex/i82801ex_ide.c)0
-rw-r--r--src/southbridge/intel/i82801ex/lpc.c (renamed from src/southbridge/intel/i82801ex/i82801ex_lpc.c)0
-rw-r--r--src/southbridge/intel/i82801ex/pci.c (renamed from src/southbridge/intel/i82801ex/i82801ex_pci.c)0
-rw-r--r--src/southbridge/intel/i82801ex/reset.c (renamed from src/southbridge/intel/i82801ex/i82801ex_reset.c)0
-rw-r--r--src/southbridge/intel/i82801ex/sata.c (renamed from src/southbridge/intel/i82801ex/i82801ex_sata.c)0
-rw-r--r--src/southbridge/intel/i82801ex/smbus.c (renamed from src/southbridge/intel/i82801ex/i82801ex_smbus.c)2
-rw-r--r--src/southbridge/intel/i82801ex/smbus.h (renamed from src/southbridge/intel/i82801ex/i82801ex_smbus.h)0
-rw-r--r--src/southbridge/intel/i82801ex/uhci.c (renamed from src/southbridge/intel/i82801ex/i82801ex_uhci.c)0
-rw-r--r--src/southbridge/intel/i82801ex/watchdog.c (renamed from src/southbridge/intel/i82801ex/i82801ex_watchdog.c)0
-rw-r--r--src/southbridge/intel/i82801gx/Makefile.inc34
-rw-r--r--src/southbridge/intel/i82801gx/ac97.c (renamed from src/southbridge/intel/i82801gx/i82801gx_ac97.c)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/ac97.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_ac97.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/audio.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_audio.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/ich7.asl18
-rw-r--r--src/southbridge/intel/i82801gx/acpi/irqlinks.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_irqlinks.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/lpc.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_lpc.asl)2
-rw-r--r--src/southbridge/intel/i82801gx/acpi/pata.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_pata.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/pci.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_pci.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/pcie.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_pcie.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/sata.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_sata.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/smbus.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_smbus.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/acpi/usb.asl (renamed from src/southbridge/intel/i82801gx/acpi/ich7_usb.asl)0
-rw-r--r--src/southbridge/intel/i82801gx/azalia.c (renamed from src/southbridge/intel/i82801gx/i82801gx_azalia.c)0
-rw-r--r--src/southbridge/intel/i82801gx/early_smbus.c (renamed from src/southbridge/intel/i82801gx/i82801gx_early_smbus.c)2
-rw-r--r--src/southbridge/intel/i82801gx/ide.c (renamed from src/southbridge/intel/i82801gx/i82801gx_ide.c)0
-rw-r--r--src/southbridge/intel/i82801gx/lpc.c (renamed from src/southbridge/intel/i82801gx/i82801gx_lpc.c)0
-rw-r--r--src/southbridge/intel/i82801gx/nic.c (renamed from src/southbridge/intel/i82801gx/i82801gx_nic.c)0
-rw-r--r--src/southbridge/intel/i82801gx/nvs.h (renamed from src/southbridge/intel/i82801gx/i82801gx_nvs.h)0
-rw-r--r--src/southbridge/intel/i82801gx/pci.c (renamed from src/southbridge/intel/i82801gx/i82801gx_pci.c)0
-rw-r--r--src/southbridge/intel/i82801gx/pcie.c (renamed from src/southbridge/intel/i82801gx/i82801gx_pcie.c)0
-rw-r--r--src/southbridge/intel/i82801gx/reset.c (renamed from src/southbridge/intel/i82801gx/i82801gx_reset.c)0
-rw-r--r--src/southbridge/intel/i82801gx/sata.c (renamed from src/southbridge/intel/i82801gx/i82801gx_sata.c)0
-rw-r--r--src/southbridge/intel/i82801gx/smbus.c (renamed from src/southbridge/intel/i82801gx/i82801gx_smbus.c)2
-rw-r--r--src/southbridge/intel/i82801gx/smbus.h (renamed from src/southbridge/intel/i82801gx/i82801gx_smbus.h)0
-rw-r--r--src/southbridge/intel/i82801gx/smi.c (renamed from src/southbridge/intel/i82801gx/i82801gx_smi.c)0
-rw-r--r--src/southbridge/intel/i82801gx/smihandler.c (renamed from src/southbridge/intel/i82801gx/i82801gx_smihandler.c)2
-rw-r--r--src/southbridge/intel/i82801gx/usb.c (renamed from src/southbridge/intel/i82801gx/i82801gx_usb.c)0
-rw-r--r--src/southbridge/intel/i82801gx/usb_debug.c (renamed from src/southbridge/intel/i82801gx/i82801gx_usb_debug.c)0
-rw-r--r--src/southbridge/intel/i82801gx/usb_ehci.c (renamed from src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c)0
-rw-r--r--src/southbridge/intel/i82801gx/watchdog.c (renamed from src/southbridge/intel/i82801gx/i82801gx_watchdog.c)0
-rw-r--r--src/southbridge/intel/i82870/Makefile.inc6
-rw-r--r--src/southbridge/intel/i82870/ioapic.c (renamed from src/southbridge/intel/i82870/p64h2_ioapic.c)0
-rw-r--r--src/southbridge/intel/i82870/pci_parity.c (renamed from src/southbridge/intel/i82870/p64h2_pci_parity.c)0
-rw-r--r--src/southbridge/intel/i82870/pcibridge.c (renamed from src/southbridge/intel/i82870/p64h2_pcibridge.c)0
-rw-r--r--src/southbridge/intel/pxhd/Makefile.inc2
-rw-r--r--src/southbridge/intel/pxhd/bridge.c (renamed from src/southbridge/intel/pxhd/pxhd_bridge.c)0
135 files changed, 120 insertions, 120 deletions
diff --git a/src/southbridge/intel/esb6300/Makefile.inc b/src/southbridge/intel/esb6300/Makefile.inc
index 53cdb7e804..004ff13a55 100644
--- a/src/southbridge/intel/esb6300/Makefile.inc
+++ b/src/southbridge/intel/esb6300/Makefile.inc
@@ -1,12 +1,12 @@
driver-y += esb6300.c
-driver-y += esb6300_reset.c
-driver-y += esb6300_uhci.c
-driver-y += esb6300_lpc.c
-driver-y += esb6300_ide.c
-driver-y += esb6300_sata.c
-driver-y += esb6300_ehci.c
-driver-y += esb6300_smbus.c
-driver-y += esb6300_pci.c
-driver-y += esb6300_pic.c
-driver-y += esb6300_bridge1c.c
-driver-y += esb6300_ac97.c
+driver-y += reset.c
+driver-y += uhci.c
+driver-y += lpc.c
+driver-y += ide.c
+driver-y += sata.c
+driver-y += ehci.c
+driver-y += smbus.c
+driver-y += pci.c
+driver-y += pic.c
+driver-y += bridge1c.c
+driver-y += ac97.c
diff --git a/src/southbridge/intel/esb6300/esb6300_ac97.c b/src/southbridge/intel/esb6300/ac97.c
index 7b7795f5df..7b7795f5df 100644
--- a/src/southbridge/intel/esb6300/esb6300_ac97.c
+++ b/src/southbridge/intel/esb6300/ac97.c
diff --git a/src/southbridge/intel/esb6300/esb6300_bridge1c.c b/src/southbridge/intel/esb6300/bridge1c.c
index 54c2717d89..54c2717d89 100644
--- a/src/southbridge/intel/esb6300/esb6300_bridge1c.c
+++ b/src/southbridge/intel/esb6300/bridge1c.c
diff --git a/src/southbridge/intel/esb6300/esb6300_early_smbus.c b/src/southbridge/intel/esb6300/early_smbus.c
index f8587856e8..d0b9632f83 100644
--- a/src/southbridge/intel/esb6300/esb6300_early_smbus.c
+++ b/src/southbridge/intel/esb6300/early_smbus.c
@@ -1,4 +1,4 @@
-#include "esb6300_smbus.h"
+#include "smbus.h"
#define SMBUS_IO_BASE 0x0f00
diff --git a/src/southbridge/intel/esb6300/esb6300_ehci.c b/src/southbridge/intel/esb6300/ehci.c
index c103c4bd2f..c103c4bd2f 100644
--- a/src/southbridge/intel/esb6300/esb6300_ehci.c
+++ b/src/southbridge/intel/esb6300/ehci.c
diff --git a/src/southbridge/intel/esb6300/esb6300_ide.c b/src/southbridge/intel/esb6300/ide.c
index abe86a811d..abe86a811d 100644
--- a/src/southbridge/intel/esb6300/esb6300_ide.c
+++ b/src/southbridge/intel/esb6300/ide.c
diff --git a/src/southbridge/intel/esb6300/esb6300_lpc.c b/src/southbridge/intel/esb6300/lpc.c
index 67bcadc961..67bcadc961 100644
--- a/src/southbridge/intel/esb6300/esb6300_lpc.c
+++ b/src/southbridge/intel/esb6300/lpc.c
diff --git a/src/southbridge/intel/esb6300/esb6300_pci.c b/src/southbridge/intel/esb6300/pci.c
index 64aeb0db46..64aeb0db46 100644
--- a/src/southbridge/intel/esb6300/esb6300_pci.c
+++ b/src/southbridge/intel/esb6300/pci.c
diff --git a/src/southbridge/intel/esb6300/esb6300_pic.c b/src/southbridge/intel/esb6300/pic.c
index b9bfdf1fe3..b9bfdf1fe3 100644
--- a/src/southbridge/intel/esb6300/esb6300_pic.c
+++ b/src/southbridge/intel/esb6300/pic.c
diff --git a/src/southbridge/intel/esb6300/esb6300_reset.c b/src/southbridge/intel/esb6300/reset.c
index 8dbe6cb1d7..8dbe6cb1d7 100644
--- a/src/southbridge/intel/esb6300/esb6300_reset.c
+++ b/src/southbridge/intel/esb6300/reset.c
diff --git a/src/southbridge/intel/esb6300/esb6300_sata.c b/src/southbridge/intel/esb6300/sata.c
index 6dce2d2f3a..6dce2d2f3a 100644
--- a/src/southbridge/intel/esb6300/esb6300_sata.c
+++ b/src/southbridge/intel/esb6300/sata.c
diff --git a/src/southbridge/intel/esb6300/esb6300_smbus.c b/src/southbridge/intel/esb6300/smbus.c
index 5b1940f93e..c7ed04f136 100644
--- a/src/southbridge/intel/esb6300/esb6300_smbus.c
+++ b/src/southbridge/intel/esb6300/smbus.c
@@ -6,7 +6,7 @@
#include <device/smbus.h>
#include <arch/io.h>
#include "esb6300.h"
-#include "esb6300_smbus.h"
+#include "smbus.h"
static int lsmbus_read_byte(device_t dev, u8 address)
{
diff --git a/src/southbridge/intel/esb6300/esb6300_smbus.h b/src/southbridge/intel/esb6300/smbus.h
index 4f4ec5c999..4f4ec5c999 100644
--- a/src/southbridge/intel/esb6300/esb6300_smbus.h
+++ b/src/southbridge/intel/esb6300/smbus.h
diff --git a/src/southbridge/intel/esb6300/esb6300_uhci.c b/src/southbridge/intel/esb6300/uhci.c
index a8bcd888f1..a8bcd888f1 100644
--- a/src/southbridge/intel/esb6300/esb6300_uhci.c
+++ b/src/southbridge/intel/esb6300/uhci.c
diff --git a/src/southbridge/intel/i3100/Makefile.inc b/src/southbridge/intel/i3100/Makefile.inc
index dcc1fb7357..fa6caf1b52 100644
--- a/src/southbridge/intel/i3100/Makefile.inc
+++ b/src/southbridge/intel/i3100/Makefile.inc
@@ -1,9 +1,9 @@
driver-y += i3100.c
-driver-y += i3100_uhci.c
-driver-y += i3100_lpc.c
-driver-y += i3100_sata.c
-driver-y += i3100_ehci.c
-driver-y += i3100_smbus.c
-driver-y += i3100_pci.c
-ramstage-y += i3100_reset.c
-ramstage-y += i3100_pciexp_portb.c
+driver-y += uhci.c
+driver-y += lpc.c
+driver-y += sata.c
+driver-y += ehci.c
+driver-y += smbus.c
+driver-y += pci.c
+ramstage-y += reset.c
+ramstage-y += pciexp_portb.c
diff --git a/src/southbridge/intel/i3100/i3100_early_lpc.c b/src/southbridge/intel/i3100/early_lpc.c
index 3397aff1f8..3397aff1f8 100644
--- a/src/southbridge/intel/i3100/i3100_early_lpc.c
+++ b/src/southbridge/intel/i3100/early_lpc.c
diff --git a/src/southbridge/intel/i3100/i3100_early_smbus.c b/src/southbridge/intel/i3100/early_smbus.c
index 79825d153a..f3d4450c5e 100644
--- a/src/southbridge/intel/i3100/i3100_early_smbus.c
+++ b/src/southbridge/intel/i3100/early_smbus.c
@@ -18,7 +18,7 @@
*
*/
-#include "i3100_smbus.h"
+#include "smbus.h"
#define SMBUS_IO_BASE 0x0f00
diff --git a/src/southbridge/intel/i3100/i3100_ehci.c b/src/southbridge/intel/i3100/ehci.c
index 195ea99cd1..195ea99cd1 100644
--- a/src/southbridge/intel/i3100/i3100_ehci.c
+++ b/src/southbridge/intel/i3100/ehci.c
diff --git a/src/southbridge/intel/i3100/i3100_lpc.c b/src/southbridge/intel/i3100/lpc.c
index 1544ecd44f..1544ecd44f 100644
--- a/src/southbridge/intel/i3100/i3100_lpc.c
+++ b/src/southbridge/intel/i3100/lpc.c
diff --git a/src/southbridge/intel/i3100/i3100_pci.c b/src/southbridge/intel/i3100/pci.c
index 99fc95d0f6..99fc95d0f6 100644
--- a/src/southbridge/intel/i3100/i3100_pci.c
+++ b/src/southbridge/intel/i3100/pci.c
diff --git a/src/southbridge/intel/i3100/i3100_pciexp_portb.c b/src/southbridge/intel/i3100/pciexp_portb.c
index 31502a46de..31502a46de 100644
--- a/src/southbridge/intel/i3100/i3100_pciexp_portb.c
+++ b/src/southbridge/intel/i3100/pciexp_portb.c
diff --git a/src/southbridge/intel/i3100/i3100_reset.c b/src/southbridge/intel/i3100/reset.c
index 3f35f5fb83..3f35f5fb83 100644
--- a/src/southbridge/intel/i3100/i3100_reset.c
+++ b/src/southbridge/intel/i3100/reset.c
diff --git a/src/southbridge/intel/i3100/i3100_sata.c b/src/southbridge/intel/i3100/sata.c
index af22600f90..af22600f90 100644
--- a/src/southbridge/intel/i3100/i3100_sata.c
+++ b/src/southbridge/intel/i3100/sata.c
diff --git a/src/southbridge/intel/i3100/i3100_smbus.c b/src/southbridge/intel/i3100/smbus.c
index f51363d92a..23602acb21 100644
--- a/src/southbridge/intel/i3100/i3100_smbus.c
+++ b/src/southbridge/intel/i3100/smbus.c
@@ -26,7 +26,7 @@
#include <device/smbus.h>
#include <arch/io.h>
#include "i3100.h"
-#include "i3100_smbus.h"
+#include "smbus.h"
static int lsmbus_read_byte(device_t dev, u8 address)
{
diff --git a/src/southbridge/intel/i3100/i3100_smbus.h b/src/southbridge/intel/i3100/smbus.h
index 7023a5b751..7023a5b751 100644
--- a/src/southbridge/intel/i3100/i3100_smbus.h
+++ b/src/southbridge/intel/i3100/smbus.h
diff --git a/src/southbridge/intel/i3100/i3100_uhci.c b/src/southbridge/intel/i3100/uhci.c
index 5453509769..5453509769 100644
--- a/src/southbridge/intel/i3100/i3100_uhci.c
+++ b/src/southbridge/intel/i3100/uhci.c
diff --git a/src/southbridge/intel/i82371eb/Makefile.inc b/src/southbridge/intel/i82371eb/Makefile.inc
index b5ac581ff1..6b27af3c4a 100644
--- a/src/southbridge/intel/i82371eb/Makefile.inc
+++ b/src/southbridge/intel/i82371eb/Makefile.inc
@@ -19,13 +19,13 @@
##
driver-y += i82371eb.c
-driver-y += i82371eb_isa.c
-driver-y += i82371eb_ide.c
-driver-y += i82371eb_usb.c
-driver-y += i82371eb_smbus.c
-driver-y += i82371eb_reset.c
-driver-$(CONFIG_HAVE_ACPI_TABLES) += i82371eb_fadt.c
+driver-y += isa.c
+driver-y += ide.c
+driver-y += usb.c
+driver-y += smbus.c
+driver-y += reset.c
+driver-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
driver-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.c
-romstage-y += i82371eb_early_pm.c
-romstage-y += i82371eb_early_smbus.c
+romstage-y += early_pm.c
+romstage-y += early_smbus.c
diff --git a/src/southbridge/intel/i82371eb/bootblock.c b/src/southbridge/intel/i82371eb/bootblock.c
index c818691639..f83b4073c1 100644
--- a/src/southbridge/intel/i82371eb/bootblock.c
+++ b/src/southbridge/intel/i82371eb/bootblock.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "southbridge/intel/i82371eb/i82371eb_enable_rom.c"
+#include "southbridge/intel/i82371eb/enable_rom.c"
static void bootblock_southbridge_init(void)
{
diff --git a/src/southbridge/intel/i82371eb/i82371eb_early_pm.c b/src/southbridge/intel/i82371eb/early_pm.c
index 5e52985428..5e52985428 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_early_pm.c
+++ b/src/southbridge/intel/i82371eb/early_pm.c
diff --git a/src/southbridge/intel/i82371eb/i82371eb_early_smbus.c b/src/southbridge/intel/i82371eb/early_smbus.c
index 8505762933..d11b06c4f1 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_early_smbus.c
+++ b/src/southbridge/intel/i82371eb/early_smbus.c
@@ -25,7 +25,7 @@
#include <device/pci_ids.h>
#include <device/pci_def.h>
#include "i82371eb.h"
-#include "i82371eb_smbus.h"
+#include "smbus.h"
void enable_smbus(void)
{
diff --git a/src/southbridge/intel/i82371eb/i82371eb_enable_rom.c b/src/southbridge/intel/i82371eb/enable_rom.c
index 46b0144f28..46b0144f28 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_enable_rom.c
+++ b/src/southbridge/intel/i82371eb/enable_rom.c
diff --git a/src/southbridge/intel/i82371eb/i82371eb_fadt.c b/src/southbridge/intel/i82371eb/fadt.c
index 5891440d2e..5891440d2e 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_fadt.c
+++ b/src/southbridge/intel/i82371eb/fadt.c
diff --git a/src/southbridge/intel/i82371eb/i82371eb_ide.c b/src/southbridge/intel/i82371eb/ide.c
index f72bcb63c6..f72bcb63c6 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_ide.c
+++ b/src/southbridge/intel/i82371eb/ide.c
diff --git a/src/southbridge/intel/i82371eb/i82371eb_isa.c b/src/southbridge/intel/i82371eb/isa.c
index d025bf2393..d025bf2393 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_isa.c
+++ b/src/southbridge/intel/i82371eb/isa.c
diff --git a/src/southbridge/intel/i82371eb/i82371eb_reset.c b/src/southbridge/intel/i82371eb/reset.c
index baff05b143..baff05b143 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_reset.c
+++ b/src/southbridge/intel/i82371eb/reset.c
diff --git a/src/southbridge/intel/i82371eb/i82371eb_smbus.c b/src/southbridge/intel/i82371eb/smbus.c
index 4dfd2f4caf..b1a51c6a8a 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_smbus.c
+++ b/src/southbridge/intel/i82371eb/smbus.c
@@ -29,7 +29,7 @@
#include <device/pci_ids.h>
#include <device/smbus.h>
#include "i82371eb.h"
-#include "i82371eb_smbus.h"
+#include "smbus.h"
static void pwrmgt_enable(struct device *dev)
{
diff --git a/src/southbridge/intel/i82371eb/i82371eb_smbus.h b/src/southbridge/intel/i82371eb/smbus.h
index f82f2edc73..f82f2edc73 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_smbus.h
+++ b/src/southbridge/intel/i82371eb/smbus.h
diff --git a/src/southbridge/intel/i82371eb/i82371eb_usb.c b/src/southbridge/intel/i82371eb/usb.c
index 1a903a95b0..1a903a95b0 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_usb.c
+++ b/src/southbridge/intel/i82371eb/usb.c
diff --git a/src/southbridge/intel/i82801ax/Makefile.inc b/src/southbridge/intel/i82801ax/Makefile.inc
index a282dd1e36..de0c7228ed 100644
--- a/src/southbridge/intel/i82801ax/Makefile.inc
+++ b/src/southbridge/intel/i82801ax/Makefile.inc
@@ -19,15 +19,15 @@
##
driver-y += i82801ax.c
-driver-y += i82801ax_ac97.c
-driver-y += i82801ax_ide.c
-driver-y += i82801ax_lpc.c
-driver-y += i82801ax_pci.c
-driver-y += i82801ax_smbus.c
-driver-y += i82801ax_usb.c
+driver-y += ac97.c
+driver-y += ide.c
+driver-y += lpc.c
+driver-y += pci.c
+driver-y += smbus.c
+driver-y += usb.c
-ramstage-y += i82801ax_reset.c
-ramstage-y += i82801ax_watchdog.c
+ramstage-y += reset.c
+ramstage-y += watchdog.c
-romstage-y += i82801ax_early_smbus.c
+romstage-y += early_smbus.c
diff --git a/src/southbridge/intel/i82801ax/i82801ax_ac97.c b/src/southbridge/intel/i82801ax/ac97.c
index 826264bbfe..826264bbfe 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_ac97.c
+++ b/src/southbridge/intel/i82801ax/ac97.c
diff --git a/src/southbridge/intel/i82801ax/i82801ax_early_smbus.c b/src/southbridge/intel/i82801ax/early_smbus.c
index dca3a28eec..e894c37095 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_early_smbus.c
+++ b/src/southbridge/intel/i82801ax/early_smbus.c
@@ -26,7 +26,7 @@
#include <device/pci_ids.h>
#include <device/pci_def.h>
#include "i82801ax.h"
-#include "i82801ax_smbus.h"
+#include "smbus.h"
void enable_smbus(void)
{
diff --git a/src/southbridge/intel/i82801ax/i82801ax_ide.c b/src/southbridge/intel/i82801ax/ide.c
index c5bd2882b4..c5bd2882b4 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_ide.c
+++ b/src/southbridge/intel/i82801ax/ide.c
diff --git a/src/southbridge/intel/i82801ax/i82801ax_lpc.c b/src/southbridge/intel/i82801ax/lpc.c
index c9404ed3c0..c9404ed3c0 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_lpc.c
+++ b/src/southbridge/intel/i82801ax/lpc.c
diff --git a/src/southbridge/intel/i82801ax/i82801ax_pci.c b/src/southbridge/intel/i82801ax/pci.c
index 293ce582c2..293ce582c2 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_pci.c
+++ b/src/southbridge/intel/i82801ax/pci.c
diff --git a/src/southbridge/intel/i82801ax/i82801ax_reset.c b/src/southbridge/intel/i82801ax/reset.c
index b30db9d9c0..b30db9d9c0 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_reset.c
+++ b/src/southbridge/intel/i82801ax/reset.c
diff --git a/src/southbridge/intel/i82801ax/i82801ax_smbus.c b/src/southbridge/intel/i82801ax/smbus.c
index 8a3155f540..d9fa970dfa 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_smbus.c
+++ b/src/southbridge/intel/i82801ax/smbus.c
@@ -24,7 +24,7 @@
#include <device/pci_ids.h>
#include <arch/io.h>
#include "i82801ax.h"
-#include "i82801ax_smbus.h"
+#include "smbus.h"
static int lsmbus_read_byte(device_t dev, u8 address)
{
diff --git a/src/southbridge/intel/i82801ax/i82801ax_smbus.h b/src/southbridge/intel/i82801ax/smbus.h
index 26893a76d9..26893a76d9 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_smbus.h
+++ b/src/southbridge/intel/i82801ax/smbus.h
diff --git a/src/southbridge/intel/i82801ax/i82801ax_usb.c b/src/southbridge/intel/i82801ax/usb.c
index 78aadb0a3e..78aadb0a3e 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_usb.c
+++ b/src/southbridge/intel/i82801ax/usb.c
diff --git a/src/southbridge/intel/i82801ax/i82801ax_watchdog.c b/src/southbridge/intel/i82801ax/watchdog.c
index cd0c20d98e..cd0c20d98e 100644
--- a/src/southbridge/intel/i82801ax/i82801ax_watchdog.c
+++ b/src/southbridge/intel/i82801ax/watchdog.c
diff --git a/src/southbridge/intel/i82801bx/Makefile.inc b/src/southbridge/intel/i82801bx/Makefile.inc
index 313a0896df..b3587f2228 100644
--- a/src/southbridge/intel/i82801bx/Makefile.inc
+++ b/src/southbridge/intel/i82801bx/Makefile.inc
@@ -19,16 +19,16 @@
##
driver-y += i82801bx.c
-driver-y += i82801bx_ac97.c
-driver-y += i82801bx_ide.c
-driver-y += i82801bx_lpc.c
-driver-y += i82801bx_nic.c
-driver-y += i82801bx_pci.c
-driver-y += i82801bx_smbus.c
-driver-y += i82801bx_usb.c
+driver-y += ac97.c
+driver-y += ide.c
+driver-y += lpc.c
+driver-y += nic.c
+driver-y += pci.c
+driver-y += smbus.c
+driver-y += usb.c
-ramstage-y += i82801bx_reset.c
-ramstage-y += i82801bx_watchdog.c
+ramstage-y += reset.c
+ramstage-y += watchdog.c
-romstage-y += i82801bx_early_smbus.c
+romstage-y += early_smbus.c
diff --git a/src/southbridge/intel/i82801bx/i82801bx_ac97.c b/src/southbridge/intel/i82801bx/ac97.c
index 5e2acd3310..5e2acd3310 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_ac97.c
+++ b/src/southbridge/intel/i82801bx/ac97.c
diff --git a/src/southbridge/intel/i82801bx/i82801bx_early_smbus.c b/src/southbridge/intel/i82801bx/early_smbus.c
index 6a2097ea14..4ff8d61cda 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_early_smbus.c
+++ b/src/southbridge/intel/i82801bx/early_smbus.c
@@ -26,7 +26,7 @@
#include <device/pci_ids.h>
#include <device/pci_def.h>
#include "i82801bx.h"
-#include "i82801bx_smbus.h"
+#include "smbus.h"
void enable_smbus(void)
{
diff --git a/src/southbridge/intel/i82801bx/i82801bx_ide.c b/src/southbridge/intel/i82801bx/ide.c
index 413984b5f4..413984b5f4 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_ide.c
+++ b/src/southbridge/intel/i82801bx/ide.c
diff --git a/src/southbridge/intel/i82801bx/i82801bx_lpc.c b/src/southbridge/intel/i82801bx/lpc.c
index 0ff44e6054..0ff44e6054 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_lpc.c
+++ b/src/southbridge/intel/i82801bx/lpc.c
diff --git a/src/southbridge/intel/i82801bx/i82801bx_nic.c b/src/southbridge/intel/i82801bx/nic.c
index b843aca328..b843aca328 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_nic.c
+++ b/src/southbridge/intel/i82801bx/nic.c
diff --git a/src/southbridge/intel/i82801bx/i82801bx_pci.c b/src/southbridge/intel/i82801bx/pci.c
index 828a668197..828a668197 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_pci.c
+++ b/src/southbridge/intel/i82801bx/pci.c
diff --git a/src/southbridge/intel/i82801bx/i82801bx_reset.c b/src/southbridge/intel/i82801bx/reset.c
index 8d85cdca75..8d85cdca75 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_reset.c
+++ b/src/southbridge/intel/i82801bx/reset.c
diff --git a/src/southbridge/intel/i82801bx/i82801bx_smbus.c b/src/southbridge/intel/i82801bx/smbus.c
index db27b094c3..d4a609ae3f 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_smbus.c
+++ b/src/southbridge/intel/i82801bx/smbus.c
@@ -24,7 +24,7 @@
#include <device/pci_ids.h>
#include <arch/io.h>
#include "i82801bx.h"
-#include "i82801bx_smbus.h"
+#include "smbus.h"
static int lsmbus_read_byte(device_t dev, u8 address)
{
diff --git a/src/southbridge/intel/i82801bx/i82801bx_smbus.h b/src/southbridge/intel/i82801bx/smbus.h
index c04e9dc8d3..c04e9dc8d3 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_smbus.h
+++ b/src/southbridge/intel/i82801bx/smbus.h
diff --git a/src/southbridge/intel/i82801bx/i82801bx_usb.c b/src/southbridge/intel/i82801bx/usb.c
index f90f6a6906..f90f6a6906 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_usb.c
+++ b/src/southbridge/intel/i82801bx/usb.c
diff --git a/src/southbridge/intel/i82801bx/i82801bx_watchdog.c b/src/southbridge/intel/i82801bx/watchdog.c
index cd0c20d98e..cd0c20d98e 100644
--- a/src/southbridge/intel/i82801bx/i82801bx_watchdog.c
+++ b/src/southbridge/intel/i82801bx/watchdog.c
diff --git a/src/southbridge/intel/i82801cx/Makefile.inc b/src/southbridge/intel/i82801cx/Makefile.inc
index 1e30c681a0..9c5c7fbc45 100644
--- a/src/southbridge/intel/i82801cx/Makefile.inc
+++ b/src/southbridge/intel/i82801cx/Makefile.inc
@@ -1,8 +1,8 @@
driver-y += i82801cx.c
-driver-y += i82801cx_usb.c
-driver-y += i82801cx_lpc.c
-driver-y += i82801cx_ide.c
-driver-y += i82801cx_ac97.c
-#driver-y += i82801cx_nic.c
-driver-y += i82801cx_pci.c
-ramstage-y += i82801cx_reset.c
+driver-y += usb.c
+driver-y += lpc.c
+driver-y += ide.c
+driver-y += ac97.c
+#driver-y += nic.c
+driver-y += pci.c
+ramstage-y += reset.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_ac97.c b/src/southbridge/intel/i82801cx/ac97.c
index 5de44fc382..5de44fc382 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_ac97.c
+++ b/src/southbridge/intel/i82801cx/ac97.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_early_smbus.c b/src/southbridge/intel/i82801cx/early_smbus.c
index b62db80f9c..b62db80f9c 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_early_smbus.c
+++ b/src/southbridge/intel/i82801cx/early_smbus.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_ide.c b/src/southbridge/intel/i82801cx/ide.c
index 74c442c52c..74c442c52c 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_ide.c
+++ b/src/southbridge/intel/i82801cx/ide.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_lpc.c b/src/southbridge/intel/i82801cx/lpc.c
index a1ffb8f540..a1ffb8f540 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_lpc.c
+++ b/src/southbridge/intel/i82801cx/lpc.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_nic.c b/src/southbridge/intel/i82801cx/nic.c
index 00ce038143..00ce038143 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_nic.c
+++ b/src/southbridge/intel/i82801cx/nic.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_pci.c b/src/southbridge/intel/i82801cx/pci.c
index 842b214fc8..842b214fc8 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_pci.c
+++ b/src/southbridge/intel/i82801cx/pci.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_reset.c b/src/southbridge/intel/i82801cx/reset.c
index bd479de758..bd479de758 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_reset.c
+++ b/src/southbridge/intel/i82801cx/reset.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_smbus.c b/src/southbridge/intel/i82801cx/smbus.c
index 324f82f286..324f82f286 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_smbus.c
+++ b/src/southbridge/intel/i82801cx/smbus.c
diff --git a/src/southbridge/intel/i82801cx/i82801cx_usb.c b/src/southbridge/intel/i82801cx/usb.c
index 28cb3572e5..28cb3572e5 100644
--- a/src/southbridge/intel/i82801cx/i82801cx_usb.c
+++ b/src/southbridge/intel/i82801cx/usb.c
diff --git a/src/southbridge/intel/i82801dx/Makefile.inc b/src/southbridge/intel/i82801dx/Makefile.inc
index 7952b3b25c..9070158d0d 100644
--- a/src/southbridge/intel/i82801dx/Makefile.inc
+++ b/src/southbridge/intel/i82801dx/Makefile.inc
@@ -20,14 +20,14 @@
##
driver-y += i82801dx.c
-driver-y += i82801dx_ac97.c
-driver-y += i82801dx_ide.c
-driver-y += i82801dx_lpc.c
-#driver-y += i82801dx_pci.c
-driver-y += i82801dx_usb.c
-driver-y += i82801dx_usb2.c
+driver-y += ac97.c
+driver-y += ide.c
+driver-y += lpc.c
+#driver-y += pci.c
+driver-y += usb.c
+driver-y += usb2.c
-ramstage-y += i82801dx_reset.c
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smi.c
+ramstage-y += reset.c
+ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smihandler.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_ac97.c b/src/southbridge/intel/i82801dx/ac97.c
index ccfccd3421..ccfccd3421 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_ac97.c
+++ b/src/southbridge/intel/i82801dx/ac97.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_early_smbus.c b/src/southbridge/intel/i82801dx/early_smbus.c
index f58cd86342..f58cd86342 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_early_smbus.c
+++ b/src/southbridge/intel/i82801dx/early_smbus.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_ide.c b/src/southbridge/intel/i82801dx/ide.c
index 75350da058..75350da058 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_ide.c
+++ b/src/southbridge/intel/i82801dx/ide.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_lpc.c b/src/southbridge/intel/i82801dx/lpc.c
index 768e70096b..768e70096b 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_lpc.c
+++ b/src/southbridge/intel/i82801dx/lpc.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_nvs.h b/src/southbridge/intel/i82801dx/nvs.h
index 03f8de74ea..03f8de74ea 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_nvs.h
+++ b/src/southbridge/intel/i82801dx/nvs.h
diff --git a/src/southbridge/intel/i82801dx/i82801dx_pci.c b/src/southbridge/intel/i82801dx/pci.c
index 610ec1e5df..610ec1e5df 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_pci.c
+++ b/src/southbridge/intel/i82801dx/pci.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_reset.c b/src/southbridge/intel/i82801dx/reset.c
index 8dbe6cb1d7..8dbe6cb1d7 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_reset.c
+++ b/src/southbridge/intel/i82801dx/reset.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_smbus.c b/src/southbridge/intel/i82801dx/smbus.c
index 1f7e47be95..1f7e47be95 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_smbus.c
+++ b/src/southbridge/intel/i82801dx/smbus.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_smi.c b/src/southbridge/intel/i82801dx/smi.c
index 55d8a70965..55d8a70965 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_smi.c
+++ b/src/southbridge/intel/i82801dx/smi.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_smihandler.c b/src/southbridge/intel/i82801dx/smihandler.c
index 5b7520f553..4875ba7480 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_smihandler.c
+++ b/src/southbridge/intel/i82801dx/smihandler.c
@@ -47,7 +47,7 @@
#define G_SMRANE (1 << 3)
#define C_BASE_SEG ((0 << 2) | (1 << 1) | (0 << 0))
-#include "i82801dx_nvs.h"
+#include "nvs.h"
/* While we read PMBASE dynamically in case it changed, let's
* initialize it with a sane value
diff --git a/src/southbridge/intel/i82801dx/i82801dx_tco_timer.c b/src/southbridge/intel/i82801dx/tco_timer.c
index a778d0851d..a778d0851d 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_tco_timer.c
+++ b/src/southbridge/intel/i82801dx/tco_timer.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_usb.c b/src/southbridge/intel/i82801dx/usb.c
index be44a293dc..be44a293dc 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_usb.c
+++ b/src/southbridge/intel/i82801dx/usb.c
diff --git a/src/southbridge/intel/i82801dx/i82801dx_usb2.c b/src/southbridge/intel/i82801dx/usb2.c
index a0ea5f64e1..a0ea5f64e1 100644
--- a/src/southbridge/intel/i82801dx/i82801dx_usb2.c
+++ b/src/southbridge/intel/i82801dx/usb2.c
diff --git a/src/southbridge/intel/i82801ex/Makefile.inc b/src/southbridge/intel/i82801ex/Makefile.inc
index ddddae37b6..e0d3148755 100644
--- a/src/southbridge/intel/i82801ex/Makefile.inc
+++ b/src/southbridge/intel/i82801ex/Makefile.inc
@@ -1,11 +1,11 @@
driver-y += i82801ex.c
-driver-y += i82801ex_uhci.c
-driver-y += i82801ex_lpc.c
-driver-y += i82801ex_ide.c
-driver-y += i82801ex_sata.c
-driver-y += i82801ex_ehci.c
-driver-y += i82801ex_smbus.c
-driver-y += i82801ex_pci.c
-driver-y += i82801ex_ac97.c
-ramstage-y += i82801ex_watchdog.c
-ramstage-y += i82801ex_reset.c
+driver-y += uhci.c
+driver-y += lpc.c
+driver-y += ide.c
+driver-y += sata.c
+driver-y += ehci.c
+driver-y += smbus.c
+driver-y += pci.c
+driver-y += ac97.c
+ramstage-y += watchdog.c
+ramstage-y += reset.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_ac97.c b/src/southbridge/intel/i82801ex/ac97.c
index 08efe1534d..08efe1534d 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_ac97.c
+++ b/src/southbridge/intel/i82801ex/ac97.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_early_smbus.c b/src/southbridge/intel/i82801ex/early_smbus.c
index b07c77a94f..cdf1f62c57 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_early_smbus.c
+++ b/src/southbridge/intel/i82801ex/early_smbus.c
@@ -1,4 +1,4 @@
-#include "i82801ex_smbus.h"
+#include "smbus.h"
#define SMBUS_IO_BASE 0x0f00
diff --git a/src/southbridge/intel/i82801ex/i82801ex_ehci.c b/src/southbridge/intel/i82801ex/ehci.c
index 8ae921d194..8ae921d194 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_ehci.c
+++ b/src/southbridge/intel/i82801ex/ehci.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_ide.c b/src/southbridge/intel/i82801ex/ide.c
index bbab6f1cc0..bbab6f1cc0 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_ide.c
+++ b/src/southbridge/intel/i82801ex/ide.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_lpc.c b/src/southbridge/intel/i82801ex/lpc.c
index 998360ce07..998360ce07 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_lpc.c
+++ b/src/southbridge/intel/i82801ex/lpc.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_pci.c b/src/southbridge/intel/i82801ex/pci.c
index 80c6e49bc0..80c6e49bc0 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_pci.c
+++ b/src/southbridge/intel/i82801ex/pci.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_reset.c b/src/southbridge/intel/i82801ex/reset.c
index 9936892efe..9936892efe 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_reset.c
+++ b/src/southbridge/intel/i82801ex/reset.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_sata.c b/src/southbridge/intel/i82801ex/sata.c
index 9b340e9afd..9b340e9afd 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_sata.c
+++ b/src/southbridge/intel/i82801ex/sata.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_smbus.c b/src/southbridge/intel/i82801ex/smbus.c
index 377df11cd0..6bb48993b6 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_smbus.c
+++ b/src/southbridge/intel/i82801ex/smbus.c
@@ -6,7 +6,7 @@
#include <device/smbus.h>
#include <arch/io.h>
#include "i82801ex.h"
-#include "i82801ex_smbus.h"
+#include "smbus.h"
static int lsmbus_read_byte(device_t dev, u8 address)
{
diff --git a/src/southbridge/intel/i82801ex/i82801ex_smbus.h b/src/southbridge/intel/i82801ex/smbus.h
index f330c0a5de..f330c0a5de 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_smbus.h
+++ b/src/southbridge/intel/i82801ex/smbus.h
diff --git a/src/southbridge/intel/i82801ex/i82801ex_uhci.c b/src/southbridge/intel/i82801ex/uhci.c
index 56536b7273..56536b7273 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_uhci.c
+++ b/src/southbridge/intel/i82801ex/uhci.c
diff --git a/src/southbridge/intel/i82801ex/i82801ex_watchdog.c b/src/southbridge/intel/i82801ex/watchdog.c
index 26f6644763..26f6644763 100644
--- a/src/southbridge/intel/i82801ex/i82801ex_watchdog.c
+++ b/src/southbridge/intel/i82801ex/watchdog.c
diff --git a/src/southbridge/intel/i82801gx/Makefile.inc b/src/southbridge/intel/i82801gx/Makefile.inc
index dfc9c4d3b6..d3a731b2ac 100644
--- a/src/southbridge/intel/i82801gx/Makefile.inc
+++ b/src/southbridge/intel/i82801gx/Makefile.inc
@@ -18,24 +18,24 @@
##
driver-y += i82801gx.c
-driver-y += i82801gx_ac97.c
-driver-y += i82801gx_azalia.c
-driver-y += i82801gx_ide.c
-driver-y += i82801gx_lpc.c
-driver-y += i82801gx_nic.c
-driver-y += i82801gx_pci.c
-driver-y += i82801gx_pcie.c
-driver-y += i82801gx_sata.c
-driver-y += i82801gx_smbus.c
-driver-y += i82801gx_usb.c
-driver-y += i82801gx_usb_ehci.c
+driver-y += ac97.c
+driver-y += azalia.c
+driver-y += ide.c
+driver-y += lpc.c
+driver-y += nic.c
+driver-y += pci.c
+driver-y += pcie.c
+driver-y += sata.c
+driver-y += smbus.c
+driver-y += usb.c
+driver-y += usb_ehci.c
-ramstage-y += i82801gx_reset.c
-ramstage-y += i82801gx_watchdog.c
+ramstage-y += reset.c
+ramstage-y += watchdog.c
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smi.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smihandler.c
+ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
-romstage-y += i82801gx_early_smbus.c
-romstage-$(CONFIG_USBDEBUG) += i82801gx_usb_debug.c
+romstage-y += early_smbus.c
+romstage-$(CONFIG_USBDEBUG) += usb_debug.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_ac97.c b/src/southbridge/intel/i82801gx/ac97.c
index 602014bb2e..602014bb2e 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_ac97.c
+++ b/src/southbridge/intel/i82801gx/ac97.c
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_ac97.asl b/src/southbridge/intel/i82801gx/acpi/ac97.asl
index 8a8cf82217..8a8cf82217 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_ac97.asl
+++ b/src/southbridge/intel/i82801gx/acpi/ac97.asl
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_audio.asl b/src/southbridge/intel/i82801gx/acpi/audio.asl
index d03be4fdd3..d03be4fdd3 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_audio.asl
+++ b/src/southbridge/intel/i82801gx/acpi/audio.asl
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7.asl b/src/southbridge/intel/i82801gx/acpi/ich7.asl
index a37208c021..8387b20037 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7.asl
+++ b/src/southbridge/intel/i82801gx/acpi/ich7.asl
@@ -159,30 +159,30 @@ Scope(\)
}
// 0:1b.0 High Definition Audio (Azalia)
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_audio.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/audio.asl"
// PCI Express Ports
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_pcie.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/pcie.asl"
// USB
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_usb.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/usb.asl"
// PCI Bridge
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_pci.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/pci.asl"
// AC97 Audio and Modem
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_ac97.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/ac97.asl"
// LPC Bridge
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_lpc.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/lpc.asl"
// PATA
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_pata.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/pata.asl"
// SATA
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_sata.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/sata.asl"
// SMBus
-#include "../../../southbridge/intel/i82801gx/acpi/ich7_smbus.asl"
+#include "../../../southbridge/intel/i82801gx/acpi/smbus.asl"
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_irqlinks.asl b/src/southbridge/intel/i82801gx/acpi/irqlinks.asl
index 5fcee45f29..5fcee45f29 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_irqlinks.asl
+++ b/src/southbridge/intel/i82801gx/acpi/irqlinks.asl
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_lpc.asl b/src/southbridge/intel/i82801gx/acpi/lpc.asl
index a18673c679..3166a89baf 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_lpc.asl
+++ b/src/southbridge/intel/i82801gx/acpi/lpc.asl
@@ -51,7 +51,7 @@ Device (LPCB)
RCBA, 18,
}
- #include "../../../southbridge/intel/i82801gx/acpi/ich7_irqlinks.asl"
+ #include "../../../southbridge/intel/i82801gx/acpi/irqlinks.asl"
#include "acpi/ec.asl"
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_pata.asl b/src/southbridge/intel/i82801gx/acpi/pata.asl
index 1905ed26d2..1905ed26d2 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_pata.asl
+++ b/src/southbridge/intel/i82801gx/acpi/pata.asl
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_pci.asl b/src/southbridge/intel/i82801gx/acpi/pci.asl
index d253d51a78..d253d51a78 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_pci.asl
+++ b/src/southbridge/intel/i82801gx/acpi/pci.asl
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_pcie.asl b/src/southbridge/intel/i82801gx/acpi/pcie.asl
index a76c7fbe4d..a76c7fbe4d 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_pcie.asl
+++ b/src/southbridge/intel/i82801gx/acpi/pcie.asl
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_sata.asl b/src/southbridge/intel/i82801gx/acpi/sata.asl
index e0c336ac5d..e0c336ac5d 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_sata.asl
+++ b/src/southbridge/intel/i82801gx/acpi/sata.asl
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_smbus.asl b/src/southbridge/intel/i82801gx/acpi/smbus.asl
index b6d2d6a2ab..b6d2d6a2ab 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_smbus.asl
+++ b/src/southbridge/intel/i82801gx/acpi/smbus.asl
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7_usb.asl b/src/southbridge/intel/i82801gx/acpi/usb.asl
index 9ae9909a9e..9ae9909a9e 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7_usb.asl
+++ b/src/southbridge/intel/i82801gx/acpi/usb.asl
diff --git a/src/southbridge/intel/i82801gx/i82801gx_azalia.c b/src/southbridge/intel/i82801gx/azalia.c
index 362ffa3aa8..362ffa3aa8 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_azalia.c
+++ b/src/southbridge/intel/i82801gx/azalia.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_early_smbus.c b/src/southbridge/intel/i82801gx/early_smbus.c
index 0298cc94cd..1fa88730bc 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_early_smbus.c
+++ b/src/southbridge/intel/i82801gx/early_smbus.c
@@ -24,7 +24,7 @@
#include <device/pci_ids.h>
#include <device/pci_def.h>
#include "i82801gx.h"
-#include "i82801gx_smbus.h"
+#include "smbus.h"
void enable_smbus(void)
{
diff --git a/src/southbridge/intel/i82801gx/i82801gx_ide.c b/src/southbridge/intel/i82801gx/ide.c
index 6e05e0d9b5..6e05e0d9b5 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_ide.c
+++ b/src/southbridge/intel/i82801gx/ide.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index f486c1ebf8..f486c1ebf8 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_nic.c b/src/southbridge/intel/i82801gx/nic.c
index 0405294cb7..0405294cb7 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_nic.c
+++ b/src/southbridge/intel/i82801gx/nic.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_nvs.h b/src/southbridge/intel/i82801gx/nvs.h
index 03f8de74ea..03f8de74ea 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_nvs.h
+++ b/src/southbridge/intel/i82801gx/nvs.h
diff --git a/src/southbridge/intel/i82801gx/i82801gx_pci.c b/src/southbridge/intel/i82801gx/pci.c
index 4c44e1e153..4c44e1e153 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_pci.c
+++ b/src/southbridge/intel/i82801gx/pci.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_pcie.c b/src/southbridge/intel/i82801gx/pcie.c
index d69bc6d07d..d69bc6d07d 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_pcie.c
+++ b/src/southbridge/intel/i82801gx/pcie.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_reset.c b/src/southbridge/intel/i82801gx/reset.c
index 29b69ff43a..29b69ff43a 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_reset.c
+++ b/src/southbridge/intel/i82801gx/reset.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_sata.c b/src/southbridge/intel/i82801gx/sata.c
index c3908489eb..c3908489eb 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_sata.c
+++ b/src/southbridge/intel/i82801gx/sata.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_smbus.c b/src/southbridge/intel/i82801gx/smbus.c
index 50c6d0f342..834f310c6c 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_smbus.c
+++ b/src/southbridge/intel/i82801gx/smbus.c
@@ -27,7 +27,7 @@
#include <device/pci_ops.h>
#include <arch/io.h>
#include "i82801gx.h"
-#include "i82801gx_smbus.h"
+#include "smbus.h"
#define SMB_BASE 0x20
static void smbus_init(struct device *dev)
diff --git a/src/southbridge/intel/i82801gx/i82801gx_smbus.h b/src/southbridge/intel/i82801gx/smbus.h
index a03e4cd957..a03e4cd957 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_smbus.h
+++ b/src/southbridge/intel/i82801gx/smbus.h
diff --git a/src/southbridge/intel/i82801gx/i82801gx_smi.c b/src/southbridge/intel/i82801gx/smi.c
index 39d5c4dca2..39d5c4dca2 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_smi.c
+++ b/src/southbridge/intel/i82801gx/smi.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_smihandler.c b/src/southbridge/intel/i82801gx/smihandler.c
index 997ec0fd5c..aefa283571 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_smihandler.c
+++ b/src/southbridge/intel/i82801gx/smihandler.c
@@ -44,7 +44,7 @@
#define G_SMRANE (1 << 3)
#define C_BASE_SEG ((0 << 2) | (1 << 1) | (0 << 0))
-#include "i82801gx_nvs.h"
+#include "nvs.h"
/* While we read PMBASE dynamically in case it changed, let's
* initialize it with a sane value
diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb.c b/src/southbridge/intel/i82801gx/usb.c
index 00fddf7c65..00fddf7c65 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_usb.c
+++ b/src/southbridge/intel/i82801gx/usb.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c b/src/southbridge/intel/i82801gx/usb_debug.c
index 991aa5adaa..991aa5adaa 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c
+++ b/src/southbridge/intel/i82801gx/usb_debug.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c
index cd74e2b8f6..cd74e2b8f6 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/usb_ehci.c
diff --git a/src/southbridge/intel/i82801gx/i82801gx_watchdog.c b/src/southbridge/intel/i82801gx/watchdog.c
index a26786d7d0..a26786d7d0 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_watchdog.c
+++ b/src/southbridge/intel/i82801gx/watchdog.c
diff --git a/src/southbridge/intel/i82870/Makefile.inc b/src/southbridge/intel/i82870/Makefile.inc
index 8f4964573e..7ca6fb5b07 100644
--- a/src/southbridge/intel/i82870/Makefile.inc
+++ b/src/southbridge/intel/i82870/Makefile.inc
@@ -1,3 +1,3 @@
-driver-y += p64h2_ioapic.c
-driver-y += p64h2_pcibridge.c
-#driver-y += p64h2_pci_parity.c
+driver-y += ioapic.c
+driver-y += pcibridge.c
+#driver-y += pci_parity.c
diff --git a/src/southbridge/intel/i82870/p64h2_ioapic.c b/src/southbridge/intel/i82870/ioapic.c
index 6a0f0d222f..6a0f0d222f 100644
--- a/src/southbridge/intel/i82870/p64h2_ioapic.c
+++ b/src/southbridge/intel/i82870/ioapic.c
diff --git a/src/southbridge/intel/i82870/p64h2_pci_parity.c b/src/southbridge/intel/i82870/pci_parity.c
index fe27abf280..fe27abf280 100644
--- a/src/southbridge/intel/i82870/p64h2_pci_parity.c
+++ b/src/southbridge/intel/i82870/pci_parity.c
diff --git a/src/southbridge/intel/i82870/p64h2_pcibridge.c b/src/southbridge/intel/i82870/pcibridge.c
index 89b86f5966..89b86f5966 100644
--- a/src/southbridge/intel/i82870/p64h2_pcibridge.c
+++ b/src/southbridge/intel/i82870/pcibridge.c
diff --git a/src/southbridge/intel/pxhd/Makefile.inc b/src/southbridge/intel/pxhd/Makefile.inc
index 30f1f69a63..d5b3a5f88e 100644
--- a/src/southbridge/intel/pxhd/Makefile.inc
+++ b/src/southbridge/intel/pxhd/Makefile.inc
@@ -1 +1 @@
-driver-y += pxhd_bridge.c
+driver-y += bridge.c
diff --git a/src/southbridge/intel/pxhd/pxhd_bridge.c b/src/southbridge/intel/pxhd/bridge.c
index 1134f8f2f8..1134f8f2f8 100644
--- a/src/southbridge/intel/pxhd/pxhd_bridge.c
+++ b/src/southbridge/intel/pxhd/bridge.c