[coreboot-gerrit] New patch to review for coreboot: 7dfd061 Makefile: Fix adding intel/common

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3827

-gerrit

commit 7dfd0614689e97ed7ab74acfb6b9a845aa65a98f
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sun Jul 28 23:39:37 2013 +0300

    Makefile: Fix adding intel/common
    
    Directory intel/common must be conditionally added in the list
    of source directories, as the parent directory southbridge/intel
    is unconditionally added even for boards without such device.
    
    Change-Id: I7088bc6db9f56909ffa996aa7eff76cd72e177eb
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/southbridge/intel/Kconfig           | 1 +
 src/southbridge/intel/Makefile.inc      | 2 +-
 src/southbridge/intel/bd82x6x/Kconfig   | 1 +
 src/southbridge/intel/common/Kconfig    | 2 ++
 src/southbridge/intel/i82801dx/Kconfig  | 1 +
 src/southbridge/intel/i82801ex/Kconfig  | 1 +
 src/southbridge/intel/i82801gx/Kconfig  | 1 +
 src/southbridge/intel/i82801ix/Kconfig  | 1 +
 src/southbridge/intel/lynxpoint/Kconfig | 1 +
 src/southbridge/intel/sch/Kconfig       | 1 +
 10 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/southbridge/intel/Kconfig b/src/southbridge/intel/Kconfig
index 5637c4a..788d3e1 100644
--- a/src/southbridge/intel/Kconfig
+++ b/src/southbridge/intel/Kconfig
@@ -1,3 +1,4 @@
+source src/southbridge/intel/common/Kconfig
 source src/southbridge/intel/esb6300/Kconfig
 source src/southbridge/intel/i3100/Kconfig
 source src/southbridge/intel/i82371eb/Kconfig
diff --git a/src/southbridge/intel/Makefile.inc b/src/southbridge/intel/Makefile.inc
index d795618..8f48caa 100644
--- a/src/southbridge/intel/Makefile.inc
+++ b/src/southbridge/intel/Makefile.inc
@@ -1,4 +1,4 @@
-subdirs-y += common
+subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_COMMON) += common
 subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_ESB6300) += esb6300
 subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I3100) += i3100
 subdirs-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb
diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index e6a4fc8..bf020f8 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -27,6 +27,7 @@ if SOUTHBRIDGE_INTEL_BD82X6X || SOUTHBRIDGE_INTEL_C216
 
 config SOUTH_BRIDGE_OPTIONS # dummy
 	def_bool y
+	select SOUTHBRIDGE_INTEL_COMMON
 	select IOAPIC
 	select HAVE_HARD_RESET
 	select HAVE_USBDEBUG
diff --git a/src/southbridge/intel/common/Kconfig b/src/southbridge/intel/common/Kconfig
new file mode 100644
index 0000000..949310b
--- /dev/null
+++ b/src/southbridge/intel/common/Kconfig
@@ -0,0 +1,2 @@
+config SOUTHBRIDGE_INTEL_COMMON
+	def_bool n
diff --git a/src/southbridge/intel/i82801dx/Kconfig b/src/southbridge/intel/i82801dx/Kconfig
index 4a43458..f7f93a7 100644
--- a/src/southbridge/intel/i82801dx/Kconfig
+++ b/src/southbridge/intel/i82801dx/Kconfig
@@ -21,6 +21,7 @@
 
 config SOUTHBRIDGE_INTEL_I82801DX
 	bool
+	select SOUTHBRIDGE_INTEL_COMMON
 	select IOAPIC
 	select HAVE_HARD_RESET
 	select HAVE_SMI_HANDLER
diff --git a/src/southbridge/intel/i82801ex/Kconfig b/src/southbridge/intel/i82801ex/Kconfig
index b1d7dbb..e4e9160 100644
--- a/src/southbridge/intel/i82801ex/Kconfig
+++ b/src/southbridge/intel/i82801ex/Kconfig
@@ -1,5 +1,6 @@
 config SOUTHBRIDGE_INTEL_I82801EX
 	bool
+	select SOUTHBRIDGE_INTEL_COMMON
 	select IOAPIC
 	select HAVE_HARD_RESET
 	select HAVE_USBDEBUG
diff --git a/src/southbridge/intel/i82801gx/Kconfig b/src/southbridge/intel/i82801gx/Kconfig
index a991f60..d4a6baa 100644
--- a/src/southbridge/intel/i82801gx/Kconfig
+++ b/src/southbridge/intel/i82801gx/Kconfig
@@ -19,6 +19,7 @@
 
 config SOUTHBRIDGE_INTEL_I82801GX
 	bool
+	select SOUTHBRIDGE_INTEL_COMMON
 	select IOAPIC
 	select HAVE_HARD_RESET
 	select HAVE_USBDEBUG
diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig
index 36cfefb..dd07dac 100644
--- a/src/southbridge/intel/i82801ix/Kconfig
+++ b/src/southbridge/intel/i82801ix/Kconfig
@@ -20,6 +20,7 @@
 
 config SOUTHBRIDGE_INTEL_I82801IX
 	bool
+	select SOUTHBRIDGE_INTEL_COMMON
 	select IOAPIC
 	select HAVE_USBDEBUG
 	select HAVE_HARD_RESET
diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig
index bd4f8d0..79aba6c 100644
--- a/src/southbridge/intel/lynxpoint/Kconfig
+++ b/src/southbridge/intel/lynxpoint/Kconfig
@@ -24,6 +24,7 @@ if SOUTHBRIDGE_INTEL_LYNXPOINT
 
 config SOUTH_BRIDGE_OPTIONS # dummy
 	def_bool y
+	select SOUTHBRIDGE_INTEL_COMMON
 	select IOAPIC
 	select HAVE_HARD_RESET
 	select HAVE_USBDEBUG
diff --git a/src/southbridge/intel/sch/Kconfig b/src/southbridge/intel/sch/Kconfig
index b106dd1..432fb8d 100644
--- a/src/southbridge/intel/sch/Kconfig
+++ b/src/southbridge/intel/sch/Kconfig
@@ -19,6 +19,7 @@
 
 config SOUTHBRIDGE_INTEL_SCH
 	bool
+	select SOUTHBRIDGE_INTEL_COMMON
 	select HAVE_USBDEBUG
 	select HAVE_HARD_RESET
 	select HAVE_SMI_HANDLER