diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index 15622c94e6..266fc89bc8 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -12,7 +12,6 @@ config CPU_AMD_AGESA
 	select UDELAY_LAPIC
 	select LAPIC_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
-	select SMM_ASEG
 	select SSE2
 
 if CPU_AMD_AGESA
diff --git a/src/cpu/amd/agesa/family14/Kconfig b/src/cpu/amd/agesa/family14/Kconfig
index a2790a1615..fc1b878e63 100644
--- a/src/cpu/amd/agesa/family14/Kconfig
+++ b/src/cpu/amd/agesa/family14/Kconfig
@@ -2,4 +2,5 @@
 
 config CPU_AMD_AGESA_FAMILY14
 	bool
+	select NO_SMM
 	select X86_AMD_FIXED_MTRRS
diff --git a/src/cpu/amd/agesa/family15tn/Kconfig b/src/cpu/amd/agesa/family15tn/Kconfig
index a0288d7bda..0cccaa6f00 100644
--- a/src/cpu/amd/agesa/family15tn/Kconfig
+++ b/src/cpu/amd/agesa/family15tn/Kconfig
@@ -3,4 +3,5 @@
 config CPU_AMD_AGESA_FAMILY15_TN
 	bool
 	select IDS_OPTIONS_HOOKED_UP
+	select SMM_ASEG
 	select X86_AMD_FIXED_MTRRS
diff --git a/src/cpu/amd/agesa/family16kb/Kconfig b/src/cpu/amd/agesa/family16kb/Kconfig
index 08e8009894..60bf64f2db 100644
--- a/src/cpu/amd/agesa/family16kb/Kconfig
+++ b/src/cpu/amd/agesa/family16kb/Kconfig
@@ -2,6 +2,7 @@
 
 config CPU_AMD_AGESA_FAMILY16_KB
 	bool
+	select SMM_ASEG
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_AGESA_FAMILY16_KB