Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/88995?usp=email ) Change subject: mainboard/emulation/qemu-q35: Do not compile memmap into SMM ...................................................................... mainboard/emulation/qemu-q35: Do not compile memmap into SMM This file contains functions related to PCIe and SMM, and so it's needed by bootblock and ramstage, and possibly romstage. It's not needed by SMM, and in a follow-up, the SMI handler will define `smm_region`, causing a function redefinition error. As this file isn't needed in SMM, and the SMI handler's function will work for this board too, as it works for all silicon (it returns values populated during ramstage, by board/silicon implementations of the function), drop this compilation unit from SMM. Change-Id: I0195e7d42b0669d675879fb4d2596aa4607095b9 Signed-off-by: Benjamin Doron <benjamin.doron@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/88995 Reviewed-by: Paul Menzel <paulepanter@mailbox.org> Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> --- M src/mainboard/emulation/qemu-q35/Makefile.mk 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Paul Menzel: Looks good to me, but someone else must approve Patrick Rudolph: Looks good to me, approved build bot (Jenkins): Verified diff --git a/src/mainboard/emulation/qemu-q35/Makefile.mk b/src/mainboard/emulation/qemu-q35/Makefile.mk index fc85e64..2ad19b9 100644 --- a/src/mainboard/emulation/qemu-q35/Makefile.mk +++ b/src/mainboard/emulation/qemu-q35/Makefile.mk @@ -21,5 +21,4 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c smm-y += ../qemu-i440fx/rom_media.c -smm-y += memmap.c smm-y += smihandler.c -- To view, visit https://review.coreboot.org/c/coreboot/+/88995?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I0195e7d42b0669d675879fb4d2596aa4607095b9 Gerrit-Change-Number: 88995 Gerrit-PatchSet: 2 Gerrit-Owner: Benjamin Doron <benjamin.doron00@gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier@gmail.com> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph@9elements.com> Gerrit-Reviewer: Paul Menzel <paulepanter@mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>