HAOUAS Elyes has uploaded this change for review.
mb/google/{glados & variants}: Remove duplicated HAVE_SMI_HANDLER
HAVE_SMI_HANDLER is already selected in soc/intel/skylake/Kconfig
Use "smm-$(CONFIG_HAVE_SMI_HANDLER)" in Makefile.inc files.
Change-Id: Ia60e34ee03958b05f2ac0c326632b6dd9f02a2e0
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/mainboard/google/glados/Kconfig
M src/mainboard/google/glados/variants/caroline/Makefile.inc
M src/mainboard/google/glados/variants/cave/Makefile.inc
M src/mainboard/google/glados/variants/chell/Makefile.inc
M src/mainboard/google/glados/variants/glados/Makefile.inc
5 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/30476/1
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 80cc0f3..05572df 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -12,7 +12,6 @@
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
- select HAVE_SMI_HANDLER
select INTEL_GMA_HAVE_VBT if !BOARD_GOOGLE_GLADOS
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/google/glados/variants/caroline/Makefile.inc b/src/mainboard/google/glados/variants/caroline/Makefile.inc
index 21b20e6..73d7090 100644
--- a/src/mainboard/google/glados/variants/caroline/Makefile.inc
+++ b/src/mainboard/google/glados/variants/caroline/Makefile.inc
@@ -16,7 +16,7 @@
romstage-y += variant.c
ramstage-y += variant.c
-smm-y += variant.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += variant.c
SPD_BIN = $(obj)/spd.bin
diff --git a/src/mainboard/google/glados/variants/cave/Makefile.inc b/src/mainboard/google/glados/variants/cave/Makefile.inc
index f3b52c2..5d95e34 100644
--- a/src/mainboard/google/glados/variants/cave/Makefile.inc
+++ b/src/mainboard/google/glados/variants/cave/Makefile.inc
@@ -16,7 +16,7 @@
romstage-y += variant.c
ramstage-y += variant.c
-smm-y += variant.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += variant.c
SPD_BIN = $(obj)/spd.bin
diff --git a/src/mainboard/google/glados/variants/chell/Makefile.inc b/src/mainboard/google/glados/variants/chell/Makefile.inc
index 986bdd8..2eff4b1 100644
--- a/src/mainboard/google/glados/variants/chell/Makefile.inc
+++ b/src/mainboard/google/glados/variants/chell/Makefile.inc
@@ -16,7 +16,7 @@
romstage-y += variant.c
ramstage-y += variant.c
-smm-y += variant.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += variant.c
SPD_BIN = $(obj)/spd.bin
diff --git a/src/mainboard/google/glados/variants/glados/Makefile.inc b/src/mainboard/google/glados/variants/glados/Makefile.inc
index b6dbbd4..82dbcad 100644
--- a/src/mainboard/google/glados/variants/glados/Makefile.inc
+++ b/src/mainboard/google/glados/variants/glados/Makefile.inc
@@ -16,7 +16,7 @@
romstage-y += variant.c
ramstage-y += variant.c
-smm-y += variant.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += variant.c
SPD_BIN = $(obj)/spd.bin
To view, visit change 30476. To unsubscribe, or for help writing mail filters, visit settings.