summaryrefslogtreecommitdiff
path: root/src/mainboard/google/glados
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2018-12-28 17:35:06 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-01-03 18:06:58 +0000
commit245afa8955f0b3f381b1cb1f9139a5cfe99e11bc (patch)
tree27b04992ba5f3870b9137987edc3297d315a7def /src/mainboard/google/glados
parent5aee981ece2df091eb2866d45560af6475a089e1 (diff)
downloadcoreboot-245afa8955f0b3f381b1cb1f9139a5cfe99e11bc.tar.xz
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> Reviewed-on: https://review.coreboot.org/c/30476 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/mainboard/google/glados')
-rw-r--r--src/mainboard/google/glados/Kconfig1
-rw-r--r--src/mainboard/google/glados/variants/caroline/Makefile.inc2
-rw-r--r--src/mainboard/google/glados/variants/cave/Makefile.inc2
-rw-r--r--src/mainboard/google/glados/variants/chell/Makefile.inc2
-rw-r--r--src/mainboard/google/glados/variants/glados/Makefile.inc2
5 files changed, 4 insertions, 5 deletions
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 80cc0f3e81..05572df98e 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -12,7 +12,6 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
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 21b20e6912..73d7090953 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 f3b52c2398..5d95e348af 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 986bdd8552..2eff4b1f1d 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 b6dbbd4562..82dbcade42 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