diff options
author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-04-27 14:03:47 -0700 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-04-29 18:10:41 +0200 |
commit | 77c04e95bac0b56ced7deec1f41c0c5b6b9f8ee5 (patch) | |
tree | cf954b2a68a3f96c37222b0f82b6c2cb85ec6b9f /src | |
parent | e2c2bb944717f808de47a9c473a1885086c64425 (diff) | |
download | coreboot-77c04e95bac0b56ced7deec1f41c0c5b6b9f8ee5.tar.gz coreboot-77c04e95bac0b56ced7deec1f41c0c5b6b9f8ee5.tar.bz2 coreboot-77c04e95bac0b56ced7deec1f41c0c5b6b9f8ee5.zip |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/ec/Makefile.inc | 2 | ||||
-rw-r--r-- | src/ec/acpi/Makefile.inc | 4 | ||||
-rw-r--r-- | src/ec/compal/Makefile.inc | 1 | ||||
-rw-r--r-- | src/ec/compal/ene932/Makefile.inc | 4 | ||||
-rw-r--r-- | src/ec/google/Makefile.inc | 1 | ||||
-rw-r--r-- | src/ec/google/chromeec/Makefile.inc | 4 | ||||
-rw-r--r-- | src/ec/kontron/Makefile.inc | 1 | ||||
-rw-r--r-- | src/ec/kontron/it8516e/Makefile.inc | 4 | ||||
-rw-r--r-- | src/ec/lenovo/Makefile.inc | 2 | ||||
-rw-r--r-- | src/ec/lenovo/h8/Makefile.inc | 4 | ||||
-rw-r--r-- | src/ec/lenovo/pmh7/Makefile.inc | 4 | ||||
-rw-r--r-- | src/ec/quanta/Makefile.inc | 2 | ||||
-rw-r--r-- | src/ec/quanta/ene_kb3940q/Makefile.inc | 5 | ||||
-rw-r--r-- | src/ec/quanta/it8518/Makefile.inc | 4 | ||||
-rw-r--r-- | src/ec/smsc/Makefile.inc | 1 | ||||
-rw-r--r-- | src/ec/smsc/mec1308/Makefile.inc | 4 |
16 files changed, 36 insertions, 11 deletions
diff --git a/src/ec/Makefile.inc b/src/ec/Makefile.inc deleted file mode 100644 index be3da455f2b0..000000000000 --- 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 b39aaa2f943f..efdd4b1e61c2 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 ce75ca633958..000000000000 --- 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 fb898bedb0bd..effe34cddafc 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 9ca3f0f71a67..000000000000 --- 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 70db2e2c9814..89d64ca9ca03 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 8c3b7c78f722..000000000000 --- 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 1275cf371793..6ef87cd99284 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 8865030ea1a6..000000000000 --- 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 9fef94c547d5..4829e7b62407 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 f42e0e4cb817..a619cc7a3fb7 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 c128aec53440..000000000000 --- 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 1ce9a46f8887..a1ae764fc8f5 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 ccceb6f838c4..daf75ef1f9dc 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 3dd9cce440ae..000000000000 --- 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 0accda3f553d..c45f65dcd8a1 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 |