summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/Kconfig8
-rw-r--r--src/southbridge/Makefile.inc8
-rw-r--r--src/southbridge/amd/Kconfig8
-rw-r--r--src/southbridge/amd/amd8132/Kconfig3
-rw-r--r--src/southbridge/amd/amd8132/Makefile.inc1
-rw-r--r--src/southbridge/amd/amd8151/Kconfig3
-rw-r--r--src/southbridge/amd/amd8151/Makefile.inc1
-rw-r--r--src/southbridge/amd/cs5530/Kconfig3
-rw-r--r--src/southbridge/amd/cs5530/Makefile.inc25
-rw-r--r--src/southbridge/amd/cs5535/Kconfig3
-rw-r--r--src/southbridge/amd/cs5535/Makefile.inc3
-rw-r--r--src/southbridge/broadcom/Makefile.inc7
-rw-r--r--src/southbridge/broadcom/bcm21000/Kconfig3
-rw-r--r--src/southbridge/broadcom/bcm21000/Makefile.inc1
-rw-r--r--src/southbridge/broadcom/bcm5780/Kconfig3
-rw-r--r--src/southbridge/broadcom/bcm5780/Makefile.inc3
-rw-r--r--src/southbridge/broadcom/bcm5785/Kconfig3
-rw-r--r--src/southbridge/broadcom/bcm5785/Makefile.inc7
-rw-r--r--src/southbridge/intel/Kconfig14
-rw-r--r--src/southbridge/intel/Makefile.inc20
-rw-r--r--src/southbridge/intel/esb6300/Kconfig3
-rw-r--r--src/southbridge/intel/esb6300/Makefile.inc11
-rw-r--r--src/southbridge/intel/i3100/Kconfig3
-rw-r--r--src/southbridge/intel/i3100/Makefile.inc9
-rw-r--r--src/southbridge/intel/i82371eb/Makefile.inc14
-rw-r--r--src/southbridge/intel/i82801ca/Kconfig3
-rw-r--r--src/southbridge/intel/i82801ca/Makefile.inc10
-rw-r--r--src/southbridge/intel/i82801dbm/Kconfig3
-rw-r--r--src/southbridge/intel/i82801dbm/Makefile.inc9
-rw-r--r--src/southbridge/intel/i82801er/Kconfig3
-rw-r--r--src/southbridge/intel/i82801er/Makefile.inc11
-rw-r--r--src/southbridge/intel/i82801gx/Makefile.inc35
-rw-r--r--src/southbridge/intel/i82801xx/Makefile.inc24
-rw-r--r--src/southbridge/intel/i82870/Kconfig3
-rw-r--r--src/southbridge/intel/i82870/Makefile.inc3
-rw-r--r--src/southbridge/intel/pxhd/Kconfig3
-rw-r--r--src/southbridge/intel/pxhd/Makefile.inc1
-rw-r--r--src/southbridge/ricoh/Makefile.inc2
-rw-r--r--src/southbridge/ricoh/rl5c476/Kconfig23
-rw-r--r--src/southbridge/ricoh/rl5c476/Makefile.inc1
-rw-r--r--src/southbridge/sis/Makefile.inc2
-rw-r--r--src/southbridge/sis/sis966/Kconfig3
-rw-r--r--src/southbridge/sis/sis966/Makefile.inc11
-rw-r--r--src/southbridge/via/Kconfig7
-rw-r--r--src/southbridge/via/Makefile.inc7
-rw-r--r--src/southbridge/via/k8t890/Kconfig4
-rw-r--r--src/southbridge/via/k8t890/Makefile.inc9
-rw-r--r--src/southbridge/via/vt8231/Kconfig23
-rw-r--r--src/southbridge/via/vt8231/Makefile.inc25
-rw-r--r--src/southbridge/via/vt8235/Kconfig23
-rw-r--r--src/southbridge/via/vt8235/Makefile.inc24
-rw-r--r--src/southbridge/winbond/Makefile.inc2
-rw-r--r--src/southbridge/winbond/w83c553/Kconfig3
-rw-r--r--src/southbridge/winbond/w83c553/Makefile.inc2
54 files changed, 364 insertions, 82 deletions
diff --git a/src/southbridge/Kconfig b/src/southbridge/Kconfig
index cce8dcb60c..c25355a9f8 100644
--- a/src/southbridge/Kconfig
+++ b/src/southbridge/Kconfig
@@ -1,8 +1,8 @@
source src/southbridge/amd/Kconfig
-#source src/southbridge/broadcom/Kconfig
+source src/southbridge/broadcom/Kconfig
source src/southbridge/intel/Kconfig
source src/southbridge/nvidia/Kconfig
-#source src/southbridge/ricoh/Kconfig
-#source src/southbridge/sis/Kconfig
+source src/southbridge/ricoh/Kconfig
+source src/southbridge/sis/Kconfig
source src/southbridge/via/Kconfig
-#source src/southbridge/winbond/Kconfig
+source src/southbridge/winbond/Kconfig
diff --git a/src/southbridge/Makefile.inc b/src/southbridge/Makefile.inc
index ee6322d5c4..b3312af853 100644
--- a/src/southbridge/Makefile.inc
+++ b/src/southbridge/Makefile.inc
@@ -1,8 +1,8 @@
subdirs-y += amd
-#subdirs-y += broadcom
+subdirs-y += broadcom
subdirs-y += intel
subdirs-y += nvidia
-#subdirs-y += ricoh
-#subdirs-y += sis
+subdirs-y += ricoh
+subdirs-y += sis
subdirs-y += via
-#subdirs-y += winbond
+subdirs-y += winbond
diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig
index dc32d217f8..7b3c4574fb 100644
--- a/src/southbridge/amd/Kconfig
+++ b/src/southbridge/amd/Kconfig
@@ -2,9 +2,9 @@ source src/southbridge/amd/amd8111/Kconfig
source src/southbridge/amd/amd8131/Kconfig
source src/southbridge/amd/cs5536/Kconfig
#source src/southbridge/amd/amd8131-disable/Kconfig
-#source src/southbridge/amd/amd8132/Kconfig
-#source src/southbridge/amd/amd8151/Kconfig
-#source src/southbridge/amd/cs5530/Kconfig
-#source src/southbridge/amd/cs5535/Kconfig
+source src/southbridge/amd/amd8132/Kconfig
+source src/southbridge/amd/amd8151/Kconfig
+source src/southbridge/amd/cs5530/Kconfig
+source src/southbridge/amd/cs5535/Kconfig
source src/southbridge/amd/rs690/Kconfig
source src/southbridge/amd/sb600/Kconfig
diff --git a/src/southbridge/amd/amd8132/Kconfig b/src/southbridge/amd/amd8132/Kconfig
new file mode 100644
index 0000000000..871ca1e58b
--- /dev/null
+++ b/src/southbridge/amd/amd8132/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_AMD_AMD8132
+ bool
+ default n
diff --git a/src/southbridge/amd/amd8132/Makefile.inc b/src/southbridge/amd/amd8132/Makefile.inc
new file mode 100644
index 0000000000..283d687107
--- /dev/null
+++ b/src/southbridge/amd/amd8132/Makefile.inc
@@ -0,0 +1 @@
+driver-y += amd8132_bridge.o
diff --git a/src/southbridge/amd/amd8151/Kconfig b/src/southbridge/amd/amd8151/Kconfig
new file mode 100644
index 0000000000..5d73cc4084
--- /dev/null
+++ b/src/southbridge/amd/amd8151/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_AMD_AMD8151
+ bool
+ default n
diff --git a/src/southbridge/amd/amd8151/Makefile.inc b/src/southbridge/amd/amd8151/Makefile.inc
new file mode 100644
index 0000000000..d62ff55d3b
--- /dev/null
+++ b/src/southbridge/amd/amd8151/Makefile.inc
@@ -0,0 +1 @@
+driver-y += amd8151_agp3.o
diff --git a/src/southbridge/amd/cs5530/Kconfig b/src/southbridge/amd/cs5530/Kconfig
new file mode 100644
index 0000000000..c972e30fb8
--- /dev/null
+++ b/src/southbridge/amd/cs5530/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_AMD_CS5530
+ bool
+ default n
diff --git a/src/southbridge/amd/cs5530/Makefile.inc b/src/southbridge/amd/cs5530/Makefile.inc
new file mode 100644
index 0000000000..fa793f81b9
--- /dev/null
+++ b/src/southbridge/amd/cs5530/Makefile.inc
@@ -0,0 +1,25 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+driver-y += cs5530.o
+driver-y += cs5530_isa.o
+driver-y += cs5530_ide.o
+driver-y += cs5530_vga.o
+driver-y += cs5530_pirq.o
diff --git a/src/southbridge/amd/cs5535/Kconfig b/src/southbridge/amd/cs5535/Kconfig
new file mode 100644
index 0000000000..397057810d
--- /dev/null
+++ b/src/southbridge/amd/cs5535/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_AMD_CS5535
+ bool
+ default n
diff --git a/src/southbridge/amd/cs5535/Makefile.inc b/src/southbridge/amd/cs5535/Makefile.inc
new file mode 100644
index 0000000000..aab992fb89
--- /dev/null
+++ b/src/southbridge/amd/cs5535/Makefile.inc
@@ -0,0 +1,3 @@
+driver-y += cs5535.o
+#driver-y += cs5535_pci.o
+#driver-y += cs5535_ide.o
diff --git a/src/southbridge/broadcom/Makefile.inc b/src/southbridge/broadcom/Makefile.inc
index e928b3625b..c9de93d8bc 100644
--- a/src/southbridge/broadcom/Makefile.inc
+++ b/src/southbridge/broadcom/Makefile.inc
@@ -1,4 +1,3 @@
-subdirs-y += bcm21000
-subdirs-y += bcm5780
-subdirs-y += bcm5785
-
+subdirs-$(CONFIG_SOUTHBRIDGE_BROADCOM_BCM21000) += bcm21000
+subdirs-$(CONFIG_SOUTHBRIDGE_BROADCOM_BCM5780) += bcm5780
+subdirs-$(CONFIG_SOUTHBRIDGE_BROADCOM_BCM5785) += bcm5785
diff --git a/src/southbridge/broadcom/bcm21000/Kconfig b/src/southbridge/broadcom/bcm21000/Kconfig
new file mode 100644
index 0000000000..094c7ef006
--- /dev/null
+++ b/src/southbridge/broadcom/bcm21000/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_BROADCOM_BCM21000
+ bool
+ default n
diff --git a/src/southbridge/broadcom/bcm21000/Makefile.inc b/src/southbridge/broadcom/bcm21000/Makefile.inc
new file mode 100644
index 0000000000..a26e8d48ac
--- /dev/null
+++ b/src/southbridge/broadcom/bcm21000/Makefile.inc
@@ -0,0 +1 @@
+driver-y += bcm21000_pcie.o
diff --git a/src/southbridge/broadcom/bcm5780/Kconfig b/src/southbridge/broadcom/bcm5780/Kconfig
new file mode 100644
index 0000000000..eb73d6cd2d
--- /dev/null
+++ b/src/southbridge/broadcom/bcm5780/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_BROADCOM_BCM5780
+ bool
+ default n
diff --git a/src/southbridge/broadcom/bcm5780/Makefile.inc b/src/southbridge/broadcom/bcm5780/Makefile.inc
new file mode 100644
index 0000000000..d2edc995ef
--- /dev/null
+++ b/src/southbridge/broadcom/bcm5780/Makefile.inc
@@ -0,0 +1,3 @@
+driver-y += bcm5780_nic.o
+driver-y += bcm5780_pcix.o
+driver-y += bcm5780_pcie.o
diff --git a/src/southbridge/broadcom/bcm5785/Kconfig b/src/southbridge/broadcom/bcm5785/Kconfig
new file mode 100644
index 0000000000..f3b6cf6c8b
--- /dev/null
+++ b/src/southbridge/broadcom/bcm5785/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_BROADCOM_BCM5785
+ bool
+ default n
diff --git a/src/southbridge/broadcom/bcm5785/Makefile.inc b/src/southbridge/broadcom/bcm5785/Makefile.inc
new file mode 100644
index 0000000000..4e33aa21b6
--- /dev/null
+++ b/src/southbridge/broadcom/bcm5785/Makefile.inc
@@ -0,0 +1,7 @@
+driver-y += bcm5785.o
+driver-y += bcm5785_usb.o
+driver-y += bcm5785_lpc.o
+driver-y += bcm5785_sb_pci_main.o
+driver-y += bcm5785_ide.o
+driver-y += bcm5785_sata.o
+obj-y += bcm5785_reset.o
diff --git a/src/southbridge/intel/Kconfig b/src/southbridge/intel/Kconfig
index 25adf845a3..92be28623d 100644
--- a/src/southbridge/intel/Kconfig
+++ b/src/southbridge/intel/Kconfig
@@ -1,10 +1,10 @@
-#source src/southbridge/intel/esb6300/Kconfig
-#source src/southbridge/intel/i3100/Kconfig
+source src/southbridge/intel/esb6300/Kconfig
+source src/southbridge/intel/i3100/Kconfig
source src/southbridge/intel/i82371eb/Kconfig
-#source src/southbridge/intel/i82801ca/Kconfig
-#source src/southbridge/intel/i82801dbm/Kconfig
-#source src/southbridge/intel/i82801er/Kconfig
+source src/southbridge/intel/i82801ca/Kconfig
+source src/southbridge/intel/i82801dbm/Kconfig
+source src/southbridge/intel/i82801er/Kconfig
source src/southbridge/intel/i82801gx/Kconfig
source src/southbridge/intel/i82801xx/Kconfig
-#source src/southbridge/intel/i82870/Kconfig
-#source src/southbridge/intel/pxhd/Kconfig
+source src/southbridge/intel/i82870/Kconfig
+source src/southbridge/intel/pxhd/Kconfig
diff --git a/src/southbridge/intel/Makefile.inc b/src/southbridge/intel/Makefile.inc
index d69f0abb9c..e53450f95f 100644
--- a/src/southbridge/intel/Makefile.inc
+++ b/src/southbridge/intel/Makefile.inc
@@ -1,11 +1,11 @@
-#subdirs-y += esb6300
-#subdirs-y += i3100
-subdirs-y += i82371eb
-#subdirs-y += i82801ca
-#subdirs-y += i82801dbm
-#subdirs-y += i82801er
-subdirs-y += i82801gx
-subdirs-y += i82801xx
-#subdirs-y += i82870
-#subdirs-y += pxhd
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_ESB6300) += esb6300
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I3100) += i3100
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I82801CA) += i82801ca
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I82801DBM) += i82801dbm
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I82801ER) += i82801er
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I82870) += i82870
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_PXHD) += pxhd
diff --git a/src/southbridge/intel/esb6300/Kconfig b/src/southbridge/intel/esb6300/Kconfig
new file mode 100644
index 0000000000..fcca52002a
--- /dev/null
+++ b/src/southbridge/intel/esb6300/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_INTEL_ESB6300
+ bool
+ default n
diff --git a/src/southbridge/intel/esb6300/Makefile.inc b/src/southbridge/intel/esb6300/Makefile.inc
new file mode 100644
index 0000000000..38c66e071d
--- /dev/null
+++ b/src/southbridge/intel/esb6300/Makefile.inc
@@ -0,0 +1,11 @@
+driver-y += esb6300.o
+driver-y += esb6300_uhci.o
+driver-y += esb6300_lpc.o
+driver-y += esb6300_ide.o
+driver-y += esb6300_sata.o
+driver-y += esb6300_ehci.o
+driver-y += esb6300_smbus.o
+driver-y += esb6300_pci.o
+driver-y += esb6300_pic.o
+driver-y += esb6300_bridge1c.o
+driver-y += esb6300_ac97.o
diff --git a/src/southbridge/intel/i3100/Kconfig b/src/southbridge/intel/i3100/Kconfig
new file mode 100644
index 0000000000..c15b8e44d3
--- /dev/null
+++ b/src/southbridge/intel/i3100/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_INTEL_I3100
+ bool
+ default n
diff --git a/src/southbridge/intel/i3100/Makefile.inc b/src/southbridge/intel/i3100/Makefile.inc
new file mode 100644
index 0000000000..0a658d3a66
--- /dev/null
+++ b/src/southbridge/intel/i3100/Makefile.inc
@@ -0,0 +1,9 @@
+driver-y += i3100.o
+driver-y += i3100_uhci.o
+driver-y += i3100_lpc.o
+driver-y += i3100_sata.o
+driver-y += i3100_ehci.o
+driver-y += i3100_smbus.o
+driver-y += i3100_pci.o
+obj-y += i3100_reset.o
+obj-y += i3100_pciexp_portb.o
diff --git a/src/southbridge/intel/i82371eb/Makefile.inc b/src/southbridge/intel/i82371eb/Makefile.inc
index db55eaef2d..632f33e935 100644
--- a/src/southbridge/intel/i82371eb/Makefile.inc
+++ b/src/southbridge/intel/i82371eb/Makefile.inc
@@ -18,11 +18,11 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb_isa.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb_ide.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb_usb.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb_smbus.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb_reset.o
+driver-y += i82371eb.o
+driver-y += i82371eb_isa.o
+driver-y += i82371eb_ide.o
+driver-y += i82371eb_usb.o
+driver-y += i82371eb_smbus.o
+driver-y += i82371eb_reset.o
-#initobj-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb_early_rom.o
+#initobj-y += i82371eb_early_rom.o
diff --git a/src/southbridge/intel/i82801ca/Kconfig b/src/southbridge/intel/i82801ca/Kconfig
new file mode 100644
index 0000000000..c1182b767a
--- /dev/null
+++ b/src/southbridge/intel/i82801ca/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_INTEL_I82801CA
+ bool
+ default n
diff --git a/src/southbridge/intel/i82801ca/Makefile.inc b/src/southbridge/intel/i82801ca/Makefile.inc
new file mode 100644
index 0000000000..84e1bd3f20
--- /dev/null
+++ b/src/southbridge/intel/i82801ca/Makefile.inc
@@ -0,0 +1,10 @@
+driver-y += i82801ca.o
+driver-y += i82801ca_usb.o
+driver-y += i82801ca_lpc.o
+
+driver-$(CONFIG_IDE) += i82801ca_ide.o
+
+driver-y += i82801ca_ac97.o
+#driver-y += i82801ca_nic.o
+driver-y += i82801ca_pci.o
+obj-y += i82801ca_reset.o
diff --git a/src/southbridge/intel/i82801dbm/Kconfig b/src/southbridge/intel/i82801dbm/Kconfig
new file mode 100644
index 0000000000..815c75d7f4
--- /dev/null
+++ b/src/southbridge/intel/i82801dbm/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_INTEL_I82801DBM
+ bool
+ default n
diff --git a/src/southbridge/intel/i82801dbm/Makefile.inc b/src/southbridge/intel/i82801dbm/Makefile.inc
new file mode 100644
index 0000000000..713427971c
--- /dev/null
+++ b/src/southbridge/intel/i82801dbm/Makefile.inc
@@ -0,0 +1,9 @@
+driver-y += i82801dbm.o
+driver-y += i82801dbm_usb.o
+driver-y += i82801dbm_lpc.o
+driver-y += i82801dbm_ide.o
+driver-y += i82801dbm_usb2.o
+driver-y += i82801dbm_ac97.o
+#driver-y += i82801dbm_nic.o
+#driver-y += i82801dbm_pci.o
+obj-y += i82801dbm_reset.o
diff --git a/src/southbridge/intel/i82801er/Kconfig b/src/southbridge/intel/i82801er/Kconfig
new file mode 100644
index 0000000000..c9f786dbb2
--- /dev/null
+++ b/src/southbridge/intel/i82801er/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_INTEL_I82801ER
+ bool
+ default n
diff --git a/src/southbridge/intel/i82801er/Makefile.inc b/src/southbridge/intel/i82801er/Makefile.inc
new file mode 100644
index 0000000000..b2f81f8b2e
--- /dev/null
+++ b/src/southbridge/intel/i82801er/Makefile.inc
@@ -0,0 +1,11 @@
+driver-y += i82801er.o
+driver-y += i82801er_uhci.o
+driver-y += i82801er_lpc.o
+driver-y += i82801er_ide.o
+driver-y += i82801er_sata.o
+driver-y += i82801er_ehci.o
+driver-y += i82801er_smbus.o
+driver-y += i82801er_pci.o
+driver-y += i82801er_ac97.o
+obj-y += i82801er_watchdog.o
+obj-y += i82801er_reset.o
diff --git a/src/southbridge/intel/i82801gx/Makefile.inc b/src/southbridge/intel/i82801gx/Makefile.inc
index 1770654452..aec3c618ff 100644
--- a/src/southbridge/intel/i82801gx/Makefile.inc
+++ b/src/southbridge/intel/i82801gx/Makefile.inc
@@ -17,24 +17,21 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_ac97.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_azalia.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_ide.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_lpc.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_nic.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_pci.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_pcie.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_sata.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smbus.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_usb.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_usb_ehci.o
+driver-y += i82801gx.o
+driver-y += i82801gx_ac97.o
+driver-y += i82801gx_azalia.o
+driver-y += i82801gx_ide.o
+driver-y += i82801gx_lpc.o
+driver-y += i82801gx_nic.o
+driver-y += i82801gx_pci.o
+driver-y += i82801gx_pcie.o
+driver-y += i82801gx_sata.o
+driver-y += i82801gx_smbus.o
+driver-y += i82801gx_usb.o
+driver-y += i82801gx_usb_ehci.o
-object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_reset.o
-object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_watchdog.o
+object-y += i82801gx_reset.o
+object-y += i82801gx_watchdog.o
-# arg. How does the linux kconfig handle compound conditionals?
-ifeq ($(CONFIG_HAVE_SMI_HANDLER),y)
- object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smi.o
- smmobj-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smihandler.o
-endif
+object-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smi.o
+smmobj-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smihandler.o
diff --git a/src/southbridge/intel/i82801xx/Makefile.inc b/src/southbridge/intel/i82801xx/Makefile.inc
index 5d54fc87be..f8f2b61219 100644
--- a/src/southbridge/intel/i82801xx/Makefile.inc
+++ b/src/southbridge/intel/i82801xx/Makefile.inc
@@ -18,19 +18,19 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_ac97.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_ide.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_lpc.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_nic.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_pci.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_sata.o
-# driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_smbus.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_usb.o
-driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_usb_ehci.o
+driver-y += i82801xx.o
+driver-y += i82801xx_ac97.o
+driver-y += i82801xx_ide.o
+driver-y += i82801xx_lpc.o
+driver-y += i82801xx_nic.o
+driver-y += i82801xx_pci.o
+driver-y += i82801xx_sata.o
+# driver-y += i82801xx_smbus.o
+driver-y += i82801xx_usb.o
+driver-y += i82801xx_usb_ehci.o
-object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_reset.o
-object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_watchdog.o
+object-y += i82801xx_reset.o
+object-y += i82801xx_watchdog.o
# TODO: What about cmos_failover.c?
diff --git a/src/southbridge/intel/i82870/Kconfig b/src/southbridge/intel/i82870/Kconfig
new file mode 100644
index 0000000000..ccf1f25894
--- /dev/null
+++ b/src/southbridge/intel/i82870/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_INTEL_I82870
+ bool
+ default n
diff --git a/src/southbridge/intel/i82870/Makefile.inc b/src/southbridge/intel/i82870/Makefile.inc
new file mode 100644
index 0000000000..143d3b889f
--- /dev/null
+++ b/src/southbridge/intel/i82870/Makefile.inc
@@ -0,0 +1,3 @@
+driver-y += p64h2_ioapic.o
+driver-y += p64h2_pcibridge.o
+#driver-y += p64h2_pci_parity.o
diff --git a/src/southbridge/intel/pxhd/Kconfig b/src/southbridge/intel/pxhd/Kconfig
new file mode 100644
index 0000000000..d331a0efb6
--- /dev/null
+++ b/src/southbridge/intel/pxhd/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_INTEL_PXHD
+ bool
+ default n
diff --git a/src/southbridge/intel/pxhd/Makefile.inc b/src/southbridge/intel/pxhd/Makefile.inc
new file mode 100644
index 0000000000..4ab71045f6
--- /dev/null
+++ b/src/southbridge/intel/pxhd/Makefile.inc
@@ -0,0 +1 @@
+driver-y += pxhd_bridge.o
diff --git a/src/southbridge/ricoh/Makefile.inc b/src/southbridge/ricoh/Makefile.inc
index 81051c989b..3969392d44 100644
--- a/src/southbridge/ricoh/Makefile.inc
+++ b/src/southbridge/ricoh/Makefile.inc
@@ -1 +1 @@
-subdirs-y += rl5c476
+subdirs-$(CONFIG_SOUTHBRIDGE_RICOH_RL5C476) += rl5c476
diff --git a/src/southbridge/ricoh/rl5c476/Kconfig b/src/southbridge/ricoh/rl5c476/Kconfig
new file mode 100644
index 0000000000..0c8f73f8cc
--- /dev/null
+++ b/src/southbridge/ricoh/rl5c476/Kconfig
@@ -0,0 +1,23 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2008-2009 coresystems GmbH
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+config SOUTHBRIDGE_RICOH_RL5C476
+ bool
+ default n
+
diff --git a/src/southbridge/ricoh/rl5c476/Makefile.inc b/src/southbridge/ricoh/rl5c476/Makefile.inc
new file mode 100644
index 0000000000..7f0599994c
--- /dev/null
+++ b/src/southbridge/ricoh/rl5c476/Makefile.inc
@@ -0,0 +1 @@
+driver-y += rl5c476.o
diff --git a/src/southbridge/sis/Makefile.inc b/src/southbridge/sis/Makefile.inc
index 741df1c7d0..295b366494 100644
--- a/src/southbridge/sis/Makefile.inc
+++ b/src/southbridge/sis/Makefile.inc
@@ -1,2 +1,2 @@
-subdirs-y += sis966
+subdirs-$(CONFIG_SOUTHBRIDGE_SIS_SIS966) += sis966
diff --git a/src/southbridge/sis/sis966/Kconfig b/src/southbridge/sis/sis966/Kconfig
new file mode 100644
index 0000000000..183df4e9ec
--- /dev/null
+++ b/src/southbridge/sis/sis966/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_SIS_SIS966
+ bool
+ default n
diff --git a/src/southbridge/sis/sis966/Makefile.inc b/src/southbridge/sis/sis966/Makefile.inc
new file mode 100644
index 0000000000..3c4d894d05
--- /dev/null
+++ b/src/southbridge/sis/sis966/Makefile.inc
@@ -0,0 +1,11 @@
+driver-y += sis761.o
+driver-y += sis966.o
+driver-y += sis966_lpc.o
+driver-y += sis966_ide.o
+driver-y += sis966_usb.o
+driver-y += sis966_usb2.o
+driver-y += sis966_nic.o
+driver-y += sis966_sata.o
+driver-y += sis966_pcie.o
+driver-y += sis966_aza.o
+obj-y += sis966_reset.o
diff --git a/src/southbridge/via/Kconfig b/src/southbridge/via/Kconfig
index cbc697d3af..ab135a44fc 100644
--- a/src/southbridge/via/Kconfig
+++ b/src/southbridge/via/Kconfig
@@ -1,5 +1,4 @@
-#source src/southbridge/via/k8t890/Kconfig
-#source src/southbridge/via/vt8231/Kconfig
-#source src/southbridge/via/vt8235/Kconfig
+source src/southbridge/via/k8t890/Kconfig
+source src/southbridge/via/vt8231/Kconfig
+source src/southbridge/via/vt8235/Kconfig
source src/southbridge/via/vt8237r/Kconfig
-#source src/southbridge/via/vt82c686/Kconfig
diff --git a/src/southbridge/via/Makefile.inc b/src/southbridge/via/Makefile.inc
index b866b33458..ca555795b2 100644
--- a/src/southbridge/via/Makefile.inc
+++ b/src/southbridge/via/Makefile.inc
@@ -1,5 +1,4 @@
-#subdirs-y += k8t890
-#subdirs-y += vt8231
-#subdirs-y += vt8235
+subdirs-$(CONFIG_SOUTHBRIDGE_VIA_K8T890) += k8t890
+subdirs-$(CONFIG_SOUTHBRIDGE_VIA_VT8231) += vt8231
+subdirs-$(CONFIG_SOUTHBRIDGE_VIA_VT8235) += vt8235
subdirs-$(CONFIG_SOUTHBRIDGE_VIA_VT8237R) += vt8237r
-#subdirs-y += vt82c686
diff --git a/src/southbridge/via/k8t890/Kconfig b/src/southbridge/via/k8t890/Kconfig
new file mode 100644
index 0000000000..2219920b9a
--- /dev/null
+++ b/src/southbridge/via/k8t890/Kconfig
@@ -0,0 +1,4 @@
+config SOUTHBRIDGE_VIA_K8T890
+ bool
+ default n
+
diff --git a/src/southbridge/via/k8t890/Makefile.inc b/src/southbridge/via/k8t890/Makefile.inc
new file mode 100644
index 0000000000..0eff25e751
--- /dev/null
+++ b/src/southbridge/via/k8t890/Makefile.inc
@@ -0,0 +1,9 @@
+driver-y += k8t890_ctrl.o
+driver-y += k8t890_dram.o
+driver-y += k8t890_bridge.o
+driver-y += k8t890_host.o
+driver-y += k8t890_host_ctrl.o
+driver-y += k8t890_pcie.o
+driver-y += k8t890_traf_ctrl.o
+driver-y += k8t890_error.o
+driver-y += k8m890_chrome.o
diff --git a/src/southbridge/via/vt8231/Kconfig b/src/southbridge/via/vt8231/Kconfig
new file mode 100644
index 0000000000..c567140332
--- /dev/null
+++ b/src/southbridge/via/vt8231/Kconfig
@@ -0,0 +1,23 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2008-2009 coresystems GmbH
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+config SOUTHBRIDGE_VIA_VT8231
+ bool
+ default n
+
diff --git a/src/southbridge/via/vt8231/Makefile.inc b/src/southbridge/via/vt8231/Makefile.inc
new file mode 100644
index 0000000000..4f1dca7c46
--- /dev/null
+++ b/src/southbridge/via/vt8231/Makefile.inc
@@ -0,0 +1,25 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2007, 2009 Rudolf Marek <r.marek@assembler.cz>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License v2 as published by
+## the Free Software Foundation.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+driver-y += vt8231.o
+driver-y += vt8231_lpc.o
+driver-y += vt8231_acpi.o
+driver-y += vt8231_ide.o
+driver-y += vt8231_nic.o
+#driver-y += vt8231_usb.o
diff --git a/src/southbridge/via/vt8235/Kconfig b/src/southbridge/via/vt8235/Kconfig
new file mode 100644
index 0000000000..f8e723b784
--- /dev/null
+++ b/src/southbridge/via/vt8235/Kconfig
@@ -0,0 +1,23 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2008-2009 coresystems GmbH
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+config SOUTHBRIDGE_VIA_VT8235
+ bool
+ default n
+
diff --git a/src/southbridge/via/vt8235/Makefile.inc b/src/southbridge/via/vt8235/Makefile.inc
new file mode 100644
index 0000000000..361d6aa791
--- /dev/null
+++ b/src/southbridge/via/vt8235/Makefile.inc
@@ -0,0 +1,24 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2007, 2009 Rudolf Marek <r.marek@assembler.cz>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License v2 as published by
+## the Free Software Foundation.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+driver-y += vt8235.o
+driver-y += vt8235_ide.o
+driver-y += vt8235_lpc.o
+driver-y += vt8235_nic.o
+driver-y += vt8235_usb.o
diff --git a/src/southbridge/winbond/Makefile.inc b/src/southbridge/winbond/Makefile.inc
index 004313a7fa..7926be7e9c 100644
--- a/src/southbridge/winbond/Makefile.inc
+++ b/src/southbridge/winbond/Makefile.inc
@@ -1 +1 @@
-subdirs-y += w83c553
+subdirs-$(CONFIG_SOUTHBRIDGE_WINBOND_W83C553) += w83c553
diff --git a/src/southbridge/winbond/w83c553/Kconfig b/src/southbridge/winbond/w83c553/Kconfig
new file mode 100644
index 0000000000..b50247f250
--- /dev/null
+++ b/src/southbridge/winbond/w83c553/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_WINBOND_W83C553
+ bool
+ default n
diff --git a/src/southbridge/winbond/w83c553/Makefile.inc b/src/southbridge/winbond/w83c553/Makefile.inc
new file mode 100644
index 0000000000..ef1156822f
--- /dev/null
+++ b/src/southbridge/winbond/w83c553/Makefile.inc
@@ -0,0 +1,2 @@
+driver-y += w83c553f.o
+driver-y += w83c553f_ide.o