7 files changed, 40 insertions, 4 deletions
diff --git a/src/southbridge/Kconfig b/src/southbridge/Kconfig
index 9e38328d0f..cce8dcb60c 100644
--- a/src/southbridge/Kconfig
+++ b/src/southbridge/Kconfig
@@ -1,7 +1,7 @@
 source src/southbridge/amd/Kconfig
 #source src/southbridge/broadcom/Kconfig
 source src/southbridge/intel/Kconfig
-#source src/southbridge/nvidia/Kconfig
+source src/southbridge/nvidia/Kconfig
 #source src/southbridge/ricoh/Kconfig
 #source src/southbridge/sis/Kconfig
 source src/southbridge/via/Kconfig
diff --git a/src/southbridge/Makefile.inc b/src/southbridge/Makefile.inc
index fd040939e7..ee6322d5c4 100644
--- a/src/southbridge/Makefile.inc
+++ b/src/southbridge/Makefile.inc
@@ -1,7 +1,7 @@
 subdirs-y += amd
 #subdirs-y += broadcom
 subdirs-y += intel
-#subdirs-y += nvidia
+subdirs-y += nvidia
 #subdirs-y += ricoh
 #subdirs-y += sis
 subdirs-y += via
diff --git a/src/southbridge/nvidia/Makefile.inc b/src/southbridge/nvidia/Makefile.inc
index cb3bc70ac5..c0ea3801fb 100644
--- a/src/southbridge/nvidia/Makefile.inc
+++ b/src/southbridge/nvidia/Makefile.inc
@@ -1,3 +1,3 @@
-subdirs-y += ck804
-subdirs-y += mcp55
+subdirs-$(CONFIG_SOUTHBRIDGE_NVIDIA_CK804) += ck804
+subdirs-$(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55) += mcp55
 
diff --git a/src/southbridge/nvidia/ck804/Kconfig b/src/southbridge/nvidia/ck804/Kconfig
new file mode 100644
index 0000000000..25d4fb7279
--- /dev/null
+++ b/src/southbridge/nvidia/ck804/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_NVIDIA_CK804
+	bool
+	default n
diff --git a/src/southbridge/nvidia/ck804/Makefile.inc b/src/southbridge/nvidia/ck804/Makefile.inc
new file mode 100644
index 0000000000..13073cf82c
--- /dev/null
+++ b/src/southbridge/nvidia/ck804/Makefile.inc
@@ -0,0 +1,15 @@
+driver-y += ck804.o
+driver-y += ck804_usb.o
+driver-y += ck804_lpc.o
+driver-y += ck804_smbus.o
+driver-y += ck804_ide.o
+driver-y += ck804_sata.o
+driver-y += ck804_usb2.o
+driver-y += ck804_ac97.o
+driver-y += ck804_nic.o
+driver-y += ck804_pci.o
+driver-y += ck804_pcie.o
+driver-y += ck804_ht.o
+obj-y += ck804_reset.o
+
+obj-$(CONFIG_HAVE_ACPI_TABLES) +=ck804_fadt.o
diff --git a/src/southbridge/nvidia/mcp55/Kconfig b/src/southbridge/nvidia/mcp55/Kconfig
new file mode 100644
index 0000000000..540272ebc7
--- /dev/null
+++ b/src/southbridge/nvidia/mcp55/Kconfig
@@ -0,0 +1,3 @@
+config SOUTHBRIDGE_NVIDIA_MCP55
+	bool
+	default n
diff --git a/src/southbridge/nvidia/mcp55/Makefile.inc b/src/southbridge/nvidia/mcp55/Makefile.inc
new file mode 100644
index 0000000000..e862ff848c
--- /dev/null
+++ b/src/southbridge/nvidia/mcp55/Makefile.inc
@@ -0,0 +1,15 @@
+driver-y += mcp55.o
+driver-y += mcp55_aza.o
+driver-y += mcp55_ht.o
+driver-y += mcp55_ide.o
+driver-y += mcp55_lpc.o
+driver-y += mcp55_nic.o
+driver-y += mcp55_pci.o
+driver-y += mcp55_pcie.o
+driver-y += mcp55_sata.o
+driver-y += mcp55_smbus.o
+driver-y += mcp55_usb2.o
+driver-y += mcp55_usb.o
+driver-$(CONFIG_HAVE_ACPI_TABLES) += mcp55_fadt.o
+
+obj-y += mcp55_reset.o