diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 658d2aaf74..f34a2626f8 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -124,13 +124,6 @@ config SMM_LEGACY_ASEG
 
 if HAVE_SMI_HANDLER && !SMM_LEGACY_ASEG
 
-config SMM_MODULE_HEAP_SIZE
-	hex
-	default 0x4000
-	help
-	  This option determines the size of the heap within the SMM handler
-	  modules.
-
 config SMM_MODULE_STACK_SIZE
 	hex
 	default 0x800 if ARCH_RAMSTAGE_X86_64
diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc
index cd920daf1a..5f695909a8 100644
--- a/src/cpu/x86/smm/Makefile.inc
+++ b/src/cpu/x86/smm/Makefile.inc
@@ -67,9 +67,9 @@ $(call src-to-obj,ramstage,$(obj)/cpu/x86/smm/smmstub.manual): $(obj)/smmstub/sm
 # C-based SMM handler.
 
 ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
-$(eval $(call rmodule_link,$(obj)/smm/smm.elf, $(obj)/smm/smm.o, $(CONFIG_SMM_MODULE_HEAP_SIZE),x86_32))
+$(eval $(call rmodule_link,$(obj)/smm/smm.elf, $(obj)/smm/smm.o, 0,x86_32))
 else
-$(eval $(call rmodule_link,$(obj)/smm/smm.elf, $(obj)/smm/smm.o, $(CONFIG_SMM_MODULE_HEAP_SIZE),x86_64))
+$(eval $(call rmodule_link,$(obj)/smm/smm.elf, $(obj)/smm/smm.o, 0,x86_64))
 endif
 
 $(obj)/smm/smm: $(obj)/smm/smm.elf.rmod
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 505dc4684b..68a296078b 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -215,7 +215,6 @@ romstage-y += boot_device.c
 ramstage-y += boot_device.c
 
 smm-y += boot_device.c
-smm-y += malloc.c
 smm-y += delay.c
 smm-y += fmap.c
 smm-y += cbfs.c memcmp.c