This now builds.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4537 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

5 files changed, 42 insertions, 19 deletions

diff --git a/src/southbridge/Kconfig b/src/southbridge/Kconfig
index 51a4fb5e9c..b3303a5c36 100644
--- a/src/southbridge/Kconfig
+++ b/src/southbridge/Kconfig
@@ -1,4 +1,4 @@
-#source src/southbridge/amd/Kconfig
+source src/southbridge/amd/Kconfig
 #source src/southbridge/broadcom/Kconfig
 source src/southbridge/intel/Kconfig
 #source src/southbridge/nvidia/Kconfig
diff --git a/src/southbridge/Makefile.inc b/src/southbridge/Makefile.inc
index 8f795a2f67..8986f14e55 100644
--- a/src/southbridge/Makefile.inc
+++ b/src/southbridge/Makefile.inc
@@ -1,4 +1,4 @@
-#subdirs-y += amd
+subdirs-y += amd
 #subdirs-y += broadcom
 subdirs-y += intel
 #subdirs-y += nvidia
diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig
index d451debfa5..e8edbf455c 100644
--- a/src/southbridge/amd/Kconfig
+++ b/src/southbridge/amd/Kconfig
@@ -1,10 +1,10 @@
 source src/southbridge/amd/amd8111/Kconfig
 source src/southbridge/amd/amd8131/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/cs5536/Kconfig
-source src/southbridge/amd/rs690/Kconfig
-source src/southbridge/amd/sb600/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/cs5536/Kconfig
+#source src/southbridge/amd/rs690/Kconfig
+#source src/southbridge/amd/sb600/Kconfig
diff --git a/src/southbridge/amd/Makefile.inc b/src/southbridge/amd/Makefile.inc
index caf5e42690..a172c5d72d 100644
--- a/src/southbridge/amd/Makefile.inc
+++ b/src/southbridge/amd/Makefile.inc
@@ -1,11 +1,11 @@
-subdirs-$(SOUTHBRIDGE_AMD_AMD8111) += amd8111
-subdirs-$(SOUTHBRIDGE_AMD_AMD8131) += amd8131
-subdirs-$(SOUTHBRIDGE_AMD_AMD8112) += amd8132
-subdirs-$(SOUTHBRIDGE_AMD_AMD8151) += amd8151
-subdirs-$(SOUTHBRIDGE_AMD_RS690) += rs690
-subdirs-$(SOUTHBRIDGE_AMD_SB600) += sb600
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AMD8111) += amd8111
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AMD8131) += amd8131
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AMD8112) += amd8132
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AMD8151) += amd8151
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_RS690) += rs690
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_SB600) += sb600
 
-subdirs-$(SOUTHBRIDGE_AMD_CS5530) += cs5530
-subdirs-$(SOUTHBRIDGE_AMD_CS5535) += cs5535
-subdirs-$(SOUTHBRIDGE_AMD_CS5536) += cs5536
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5530) += cs5530
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5535) += cs5535
+subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5536) += cs5536
 
diff --git a/src/southbridge/amd/amd8131/Kconfig b/src/southbridge/amd/amd8131/Kconfig
new file mode 100644
index 0000000000..dd8bf4b955
--- /dev/null
+++ b/src/southbridge/amd/amd8131/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_AMD_AMD8131
+	bool
+	default n
+