Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34155 )
Change subject: cpu/intel: Remove HAVE_SMI_HANDLER conditional ......................................................................
cpu/intel: Remove HAVE_SMI_HANDLER conditional
Fix builds with HAVE_SMI_HANDLER=n. These functions are referenced across files as initialisers in const structs. While they won't get called, they are required for the linking to complete.
Change-Id: I80f7ec2c5ecfe1f4bd19ee2a6dc474750d9d95ab Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/cpu/intel/haswell/Makefile.inc M src/cpu/intel/smm/gen1/Makefile.inc M src/soc/intel/fsp_broadwell_de/Makefile.inc 3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/34155/1
diff --git a/src/cpu/intel/haswell/Makefile.inc b/src/cpu/intel/haswell/Makefile.inc index a472da2..e48eef7 100644 --- a/src/cpu/intel/haswell/Makefile.inc +++ b/src/cpu/intel/haswell/Makefile.inc @@ -8,7 +8,7 @@
ramstage-y += acpi.c ramstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += stage_cache.c -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c +ramstage-y += smmrelocate.c
romstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += stage_cache.c postcar-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += stage_cache.c diff --git a/src/cpu/intel/smm/gen1/Makefile.inc b/src/cpu/intel/smm/gen1/Makefile.inc index 0936710..61e9299 100644 --- a/src/cpu/intel/smm/gen1/Makefile.inc +++ b/src/cpu/intel/smm/gen1/Makefile.inc @@ -1 +1 @@ -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c +ramstage-y += smmrelocate.c diff --git a/src/soc/intel/fsp_broadwell_de/Makefile.inc b/src/soc/intel/fsp_broadwell_de/Makefile.inc index c73c12a..1aba88b 100644 --- a/src/soc/intel/fsp_broadwell_de/Makefile.inc +++ b/src/soc/intel/fsp_broadwell_de/Makefile.inc @@ -28,7 +28,7 @@ ramstage-y += smi.c ramstage-y += gpio.c ramstage-y += iou_complto.c -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c +ramstage-y += smmrelocate.c ramstage-$(CONFIG_HAVE_SMI_HANDLER) += pmutil.c ramstage-y += vtd.c smm-y += pmutil.c