summaryrefslogtreecommitdiff
path: root/src/mainboard/google/poppy
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-07 23:58:34 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-09 12:43:35 +0000
commit9265f89f4e892caa043f60272980e7cec81bce62 (patch)
tree99d503f355d88b7edc6abaf5b32ae44a94e64aa1 /src/mainboard/google/poppy
parentcb587a2522a9f5b68ee10e70832fa90eb84e6cc2 (diff)
arch/x86: Avoid HAVE_SMI_HANDLER conditional with smm-class
Build of the entire smm-class is skipped if we have HAVE_SMI_HANDLER=n. Change-Id: I10b4300ddd18b1673c404b45fd9642488ab3186c Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34125 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Lance Zhao <lance.zhao@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/poppy')
-rw-r--r--src/mainboard/google/poppy/Makefile.inc2
-rw-r--r--src/mainboard/google/poppy/variants/nami/Makefile.inc2
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/Makefile.inc4
-rw-r--r--src/mainboard/google/poppy/variants/nocturne/Makefile.inc2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mainboard/google/poppy/Makefile.inc b/src/mainboard/google/poppy/Makefile.inc
index 86754e62eb..030cf1da2d 100644
--- a/src/mainboard/google/poppy/Makefile.inc
+++ b/src/mainboard/google/poppy/Makefile.inc
@@ -25,7 +25,7 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += mainboard.c
ramstage-y += ramstage.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
smm-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
subdirs-y += variants/baseboard
diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc
index 0033c60ee7..7c1e4808a6 100644
--- a/src/mainboard/google/poppy/variants/nami/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc
@@ -35,7 +35,7 @@ ramstage-y += gpio.c
ramstage-y += nhlt.c
ramstage-y += mainboard.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
# Add OEM ID table
cbfs-files-y += oem.bin
diff --git a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc b/src/mainboard/google/poppy/variants/nautilus/Makefile.inc
index c71520601a..3a36b83bda 100644
--- a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nautilus/Makefile.inc
@@ -14,5 +14,5 @@ ramstage-y += nhlt.c
ramstage-y += mainboard.c
ramstage-y += sku.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += sku.c
+smm-y += smihandler.c
+smm-y += sku.c
diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
index 260d9c0bf3..371655a94e 100644
--- a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
@@ -22,4 +22,4 @@ ramstage-y += nhlt.c
ramstage-y += mainboard.c
ramstage-y += ec.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c
+smm-y += ec.c