diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc
index 6663d14301..85ce7f652a 100644
--- a/src/cpu/amd/Makefile.inc
+++ b/src/cpu/amd/Makefile.inc
@@ -7,7 +7,7 @@ subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2) += socket_AM2
 subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2R2) += socket_AM2r2
 subdirs-$(CONFIG_CPU_AMD_SOCKET_AM3) += socket_AM3
 subdirs-$(CONFIG_CPU_AMD_SOCKET_ASB2) += socket_ASB2
-subdirs-$(CONFIG_CPU_AMD_SOCKET_C32) += socket_C32
+subdirs-$(CONFIG_CPU_AMD_SOCKET_C32_NON_AGESA) += socket_C32
 subdirs-$(CONFIG_CPU_AMD_GEODE_GX1) += geode_gx1
 subdirs-$(CONFIG_CPU_AMD_GEODE_GX2) += geode_gx2
 subdirs-$(CONFIG_CPU_AMD_GEODE_LX) += geode_lx
diff --git a/src/cpu/amd/socket_C32/Kconfig b/src/cpu/amd/socket_C32/Kconfig
index 56324dc776..db4b624c15 100644
--- a/src/cpu/amd/socket_C32/Kconfig
+++ b/src/cpu/amd/socket_C32/Kconfig
@@ -1,4 +1,4 @@
-config CPU_AMD_SOCKET_C32
+config CPU_AMD_SOCKET_C32_NON_AGESA
 	bool
 	select CPU_AMD_MODEL_10XXX
 	select HT3_SUPPORT
@@ -8,30 +8,30 @@ config CPU_AMD_SOCKET_C32
 config CPU_SOCKET_TYPE
 	hex
 	default 0x14
-	depends on CPU_AMD_SOCKET_C32
+	depends on CPU_AMD_SOCKET_C32_NON_AGESA
 
 config EXT_RT_TBL_SUPPORT
 	bool
 	default n
-	depends on CPU_AMD_SOCKET_C32
+	depends on CPU_AMD_SOCKET_C32_NON_AGESA
 
 config EXT_CONF_SUPPORT
 	bool
 	default n
-	depends on CPU_AMD_SOCKET_C32
+	depends on CPU_AMD_SOCKET_C32_NON_AGESA
 
 config CBB
 	hex
 	default 0x0
-	depends on CPU_AMD_SOCKET_C32
+	depends on CPU_AMD_SOCKET_C32_NON_AGESA
 
 config CDB
 	hex
 	default 0x18
-	depends on CPU_AMD_SOCKET_C32
+	depends on CPU_AMD_SOCKET_C32_NON_AGESA
 
 config XIP_ROM_SIZE
 	hex
 	default 0x80000
-	depends on CPU_AMD_SOCKET_C32
+	depends on CPU_AMD_SOCKET_C32_NON_AGESA
 
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 844763e211..44f2d43896 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -3,7 +3,7 @@ if BOARD_SUPERMICRO_H8SCM_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select CPU_AMD_SOCKET_C32
+	select CPU_AMD_SOCKET_C32_NON_AGESA
 	select DIMM_DDR3
 	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10