kbuild: automatically include ECs

This change switches all ECs and the generic EC ACPI code
to be autoincluded by Makefile.inc, rather than having to be
mentioned explicitly in ec/Makefile.inc or in
ec/<vendor>/Makefile.inc.

This means, vendor and ec directories are now "drop
in", e.g. be placed in the coreboot directory hierarchy
without having to modify any higher level coreboot files.

The long term plan is to enable out of tree components to be
built with a given coreboot version (given that the API did not
change).

Change-Id: I29d757d1f8c10a1d0167a76fd0d0f97bac576f6d
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/9798
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

17 files changed, 39 insertions, 12 deletions

diff --git a/Makefile.inc b/Makefile.inc
index c1e7def..628fbdf 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -52,7 +52,9 @@ PHONY+= clean-abuild coreboot lint lint-stable build-dirs
 
 #######################################################################
 # root source directories of coreboot
-subdirs-y := src/lib src/console src/device src/ec $(wildcard src/southbridge/*/*) src/soc
+subdirs-y := src/lib src/console src/device
+subdirs-y += src/ec/acpi $(wildcard src/ec/*/*) $(wildcard src/southbridge/*/*)
+subdirs-y += src/soc
 subdirs-y += src/northbridge src/superio src/drivers src/cpu src/vendorcode
 subdirs-y += util/cbfstool util/sconfig util/nvramtool util/broadcom
 subdirs-y += $(wildcard src/arch/*)
diff --git a/src/ec/Makefile.inc b/src/ec/Makefile.inc
deleted file mode 100644
index be3da45..0000000
--- a/src/ec/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-subdirs-$(CONFIG_EC_ACPI) += acpi
-subdirs-y += compal google kontron lenovo smsc quanta
diff --git a/src/ec/acpi/Makefile.inc b/src/ec/acpi/Makefile.inc
index b39aaa2..efdd4b1 100644
--- a/src/ec/acpi/Makefile.inc
+++ b/src/ec/acpi/Makefile.inc
@@ -1,3 +1,7 @@
+ifeq ($(CONFIG_EC_ACPI),y)
+
 ramstage-y += ec.c
 smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c
 romstage-$(CONFIG_BOARD_LENOVO_X201) += ec.c
+
+endif
diff --git a/src/ec/compal/Makefile.inc b/src/ec/compal/Makefile.inc
deleted file mode 100644
index ce75ca6..0000000
--- a/src/ec/compal/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_EC_COMPAL_ENE932) += ene932
diff --git a/src/ec/compal/ene932/Makefile.inc b/src/ec/compal/ene932/Makefile.inc
index fb898be..effe34c 100644
--- a/src/ec/compal/ene932/Makefile.inc
+++ b/src/ec/compal/ene932/Makefile.inc
@@ -1,3 +1,7 @@
+ifeq ($(CONFIG_EC_COMPAL_ENE932),y)
+
 ramstage-y += ec.c
 smm-y += ec.c
 smm-y += ../../../lib/delay.c
+
+endif
diff --git a/src/ec/google/Makefile.inc b/src/ec/google/Makefile.inc
deleted file mode 100644
index 9ca3f0f..0000000
--- a/src/ec/google/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_EC_GOOGLE_CHROMEEC) += chromeec
diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc
index 70db2e2..89d64ca 100644
--- a/src/ec/google/chromeec/Makefile.inc
+++ b/src/ec/google/chromeec/Makefile.inc
@@ -1,3 +1,5 @@
+ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC),y)
+
 ramstage-y += ec.c crosec_proto.c
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c
@@ -18,3 +20,5 @@ verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c
 verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c
 verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MEC) += ec_mec.c
 verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c
+
+endif
diff --git a/src/ec/kontron/Makefile.inc b/src/ec/kontron/Makefile.inc
deleted file mode 100644
index 8c3b7c7..0000000
--- a/src/ec/kontron/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_EC_KONTRON_IT8516E) += it8516e
diff --git a/src/ec/kontron/it8516e/Makefile.inc b/src/ec/kontron/it8516e/Makefile.inc
index 1275cf3..6ef87cd 100644
--- a/src/ec/kontron/it8516e/Makefile.inc
+++ b/src/ec/kontron/it8516e/Makefile.inc
@@ -1 +1,5 @@
+ifeq ($(CONFIG_EC_KONTRON_IT8516E),y)
+
 ramstage-y += ec.c
+
+endif
diff --git a/src/ec/lenovo/Makefile.inc b/src/ec/lenovo/Makefile.inc
deleted file mode 100644
index 8865030..0000000
--- a/src/ec/lenovo/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-subdirs-$(CONFIG_EC_LENOVO_H8) += h8
-subdirs-$(CONFIG_EC_LENOVO_PMH7) += pmh7
diff --git a/src/ec/lenovo/h8/Makefile.inc b/src/ec/lenovo/h8/Makefile.inc
index 9fef94c..4829e7b 100644
--- a/src/ec/lenovo/h8/Makefile.inc
+++ b/src/ec/lenovo/h8/Makefile.inc
@@ -1 +1,5 @@
+ifeq ($(CONFIG_EC_LENOVO_H8),y)
+
 ramstage-y += h8.c
+
+endif
diff --git a/src/ec/lenovo/pmh7/Makefile.inc b/src/ec/lenovo/pmh7/Makefile.inc
index f42e0e4..a619cc7 100644
--- a/src/ec/lenovo/pmh7/Makefile.inc
+++ b/src/ec/lenovo/pmh7/Makefile.inc
@@ -1,3 +1,7 @@
+ifeq ($(CONFIG_EC_LENOVO_PMH7),y)
+
 ramstage-y += pmh7.c
 smm-$(CONFIG_HAVE_SMI_HANDLER) += pmh7.c
 romstage-y += pmh7.c
+
+endif
diff --git a/src/ec/quanta/Makefile.inc b/src/ec/quanta/Makefile.inc
deleted file mode 100644
index c128aec..0000000
--- a/src/ec/quanta/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-subdirs-$(CONFIG_EC_QUANTA_ENE_KB3940Q) += ene_kb3940q
-subdirs-$(CONFIG_EC_QUANTA_IT8518) += it8518
diff --git a/src/ec/quanta/ene_kb3940q/Makefile.inc b/src/ec/quanta/ene_kb3940q/Makefile.inc
index 1ce9a46..a1ae764 100644
--- a/src/ec/quanta/ene_kb3940q/Makefile.inc
+++ b/src/ec/quanta/ene_kb3940q/Makefile.inc
@@ -1,4 +1,7 @@
+ifeq ($(CONFIG_EC_QUANTA_ENE_KB3940Q),y)
+
 ramstage-y += ec.c
 smm-y += ec.c
-
 smm-y += ../../../lib/delay.c
+
+endif
diff --git a/src/ec/quanta/it8518/Makefile.inc b/src/ec/quanta/it8518/Makefile.inc
index ccceb6f..daf75ef 100644
--- a/src/ec/quanta/it8518/Makefile.inc
+++ b/src/ec/quanta/it8518/Makefile.inc
@@ -1,4 +1,8 @@
+ifeq ($(CONFIG_EC_QUANTA_IT8518),y)
+
 romstage-y += ec.c
 ramstage-y += ec.c
 smm-y += ec.c
 smm-y += ../../../lib/delay.c
+
+endif
diff --git a/src/ec/smsc/Makefile.inc b/src/ec/smsc/Makefile.inc
deleted file mode 100644
index 3dd9cce..0000000
--- a/src/ec/smsc/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_EC_SMSC_MEC1308) += mec1308
diff --git a/src/ec/smsc/mec1308/Makefile.inc b/src/ec/smsc/mec1308/Makefile.inc
index 0accda3..c45f65d 100644
--- a/src/ec/smsc/mec1308/Makefile.inc
+++ b/src/ec/smsc/mec1308/Makefile.inc
@@ -1,2 +1,6 @@
+ifeq ($(CONFIG_EC_SMSC_MEC1308),y)
+
 ramstage-y += ec.c
 smm-y += ec.c
+
+endif