HAOUAS Elyes has uploaded this change for review.

View Change

src/mainboard: Use smm-$(CONFIG_HAVE_SMI_HANDLER)

Use smm-$(CONFIG_HAVE_SMI_HANDLER) instead of smm-y

Change-Id: I0f91bc3e6c8ab31d837ab89af62d700b35c1e01b
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/mainboard/google/octopus/variants/ampton/Makefile.inc
M src/mainboard/google/octopus/variants/baseboard/Makefile.inc
M src/mainboard/google/octopus/variants/bip/Makefile.inc
M src/mainboard/google/poppy/variants/nocturne/Makefile.inc
M src/mainboard/google/reef/variants/baseboard/Makefile.inc
M src/mainboard/google/reef/variants/coral/Makefile.inc
M src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
M src/mainboard/intel/dcp847ske/Makefile.inc
M src/mainboard/intel/glkrvp/variants/baseboard/Makefile.inc
M src/mainboard/lenovo/g505s/Makefile.inc
M src/mainboard/lenovo/l520/Makefile.inc
M src/mainboard/lenovo/s230u/Makefile.inc
M src/mainboard/lenovo/t430/Makefile.inc
13 files changed, 13 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/30485/1

diff --git a/src/mainboard/google/octopus/variants/ampton/Makefile.inc b/src/mainboard/google/octopus/variants/ampton/Makefile.inc
index 7c092e4..dc9e435 100644
--- a/src/mainboard/google/octopus/variants/ampton/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/ampton/Makefile.inc
@@ -2,4 +2,4 @@
 
 ramstage-y += gpio.c
 
-smm-y += gpio.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += gpio.c
diff --git a/src/mainboard/google/octopus/variants/baseboard/Makefile.inc b/src/mainboard/google/octopus/variants/baseboard/Makefile.inc
index 63b03a6..bad4f10 100644
--- a/src/mainboard/google/octopus/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/baseboard/Makefile.inc
@@ -5,4 +5,4 @@
 ramstage-y += gpio.c
 ramstage-y += nhlt.c
 
-smm-y += gpio.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += gpio.c
diff --git a/src/mainboard/google/octopus/variants/bip/Makefile.inc b/src/mainboard/google/octopus/variants/bip/Makefile.inc
index 7c092e4..dc9e435 100644
--- a/src/mainboard/google/octopus/variants/bip/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/bip/Makefile.inc
@@ -2,4 +2,4 @@
 
 ramstage-y += gpio.c
 
-smm-y += gpio.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += gpio.c
diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
index e558cfc..4d5397f 100644
--- a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
@@ -21,5 +21,5 @@
 ramstage-y += nhlt.c
 ramstage-y += mainboard.c
 
-smm-y += ec.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c
 ramstage-y += ec.c
diff --git a/src/mainboard/google/reef/variants/baseboard/Makefile.inc b/src/mainboard/google/reef/variants/baseboard/Makefile.inc
index 63b03a6..bad4f10 100644
--- a/src/mainboard/google/reef/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/reef/variants/baseboard/Makefile.inc
@@ -5,4 +5,4 @@
 ramstage-y += gpio.c
 ramstage-y += nhlt.c
 
-smm-y += gpio.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += gpio.c
diff --git a/src/mainboard/google/reef/variants/coral/Makefile.inc b/src/mainboard/google/reef/variants/coral/Makefile.inc
index e52d959..814590f 100644
--- a/src/mainboard/google/reef/variants/coral/Makefile.inc
+++ b/src/mainboard/google/reef/variants/coral/Makefile.inc
@@ -3,4 +3,4 @@
 ramstage-y += mainboard.c
 ramstage-y += gpio.c
 
-smm-y += gpio.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += gpio.c
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc b/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
index f030989..80dd0d2 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
@@ -22,4 +22,4 @@
 ramstage-y += OemCustomize.c
 ramstage-y += ec.c
 
-smm-y += mainboard_smi.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
diff --git a/src/mainboard/intel/dcp847ske/Makefile.inc b/src/mainboard/intel/dcp847ske/Makefile.inc
index 96bac06..4d516f6 100644
--- a/src/mainboard/intel/dcp847ske/Makefile.inc
+++ b/src/mainboard/intel/dcp847ske/Makefile.inc
@@ -1,4 +1,4 @@
 romstage-y += early_southbridge.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-smm-y += smihandler.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/Makefile.inc b/src/mainboard/intel/glkrvp/variants/baseboard/Makefile.inc
index d2d344c..99c5e52 100644
--- a/src/mainboard/intel/glkrvp/variants/baseboard/Makefile.inc
+++ b/src/mainboard/intel/glkrvp/variants/baseboard/Makefile.inc
@@ -7,4 +7,4 @@
 ramstage-y += gpio.c
 ramstage-y += nhlt.c
 
-smm-y += gpio.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += gpio.c
diff --git a/src/mainboard/lenovo/g505s/Makefile.inc b/src/mainboard/lenovo/g505s/Makefile.inc
index f030989..80dd0d2 100644
--- a/src/mainboard/lenovo/g505s/Makefile.inc
+++ b/src/mainboard/lenovo/g505s/Makefile.inc
@@ -22,4 +22,4 @@
 ramstage-y += OemCustomize.c
 ramstage-y += ec.c
 
-smm-y += mainboard_smi.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
diff --git a/src/mainboard/lenovo/l520/Makefile.inc b/src/mainboard/lenovo/l520/Makefile.inc
index 5331f25..3afb227 100644
--- a/src/mainboard/lenovo/l520/Makefile.inc
+++ b/src/mainboard/lenovo/l520/Makefile.inc
@@ -15,4 +15,4 @@
 
 romstage-y += romstage.c
 romstage-y += gpio.c
-smm-y += smihandler.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/lenovo/s230u/Makefile.inc b/src/mainboard/lenovo/s230u/Makefile.inc
index 226eca8..39142ed 100644
--- a/src/mainboard/lenovo/s230u/Makefile.inc
+++ b/src/mainboard/lenovo/s230u/Makefile.inc
@@ -1,6 +1,6 @@
 romstage-y += gpio.c
 ramstage-y += ec.c
-smm-y += smihandler.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 
 # FIXME: SPD images for samsung_8gb and hynix_8gb are missing.
 # It's possible that no mainboards with that variation were manufactured.
diff --git a/src/mainboard/lenovo/t430/Makefile.inc b/src/mainboard/lenovo/t430/Makefile.inc
index 558ab0a..ada25f7 100644
--- a/src/mainboard/lenovo/t430/Makefile.inc
+++ b/src/mainboard/lenovo/t430/Makefile.inc
@@ -1,5 +1,5 @@
 romstage-y += romstage.c
 romstage-y += gpio.c
-smm-y += smihandler.c
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

To view, visit change 30485. To unsubscribe, or for help writing mail filters, visit settings.