diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index 9ee2bf74cf..1172d2964d 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -12,6 +12,10 @@ config CPU_AMD_MODEL_FXX
 	select SUPPORT_CPU_UCODE_IN_CBFS
 
 if CPU_AMD_MODEL_FXX
+config CPU_ADDR_BITS
+	int
+	default 40
+
 config UDELAY_IO
 	bool
 	default n
diff --git a/src/cpu/amd/socket_754/Kconfig b/src/cpu/amd/socket_754/Kconfig
index aeda4210f4..ec3ab70d56 100644
--- a/src/cpu/amd/socket_754/Kconfig
+++ b/src/cpu/amd/socket_754/Kconfig
@@ -8,10 +8,6 @@ config SOCKET_SPECIFIC_OPTIONS
 	select CPU_AMD_MODEL_FXX
 	select X86_AMD_FIXED_MTRRS
 
-config CPU_ADDR_BITS
-	int
-	default 40
-
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig
index a8eef61b0f..47b455b94c 100644
--- a/src/cpu/amd/socket_940/Kconfig
+++ b/src/cpu/amd/socket_940/Kconfig
@@ -9,10 +9,6 @@ config SOCKET_SPECIFIC_OPTIONS
 	select CPU_AMD_MODEL_FXX
 	select X86_AMD_FIXED_MTRRS
 
-config CPU_ADDR_BITS
-	int
-	default 40
-
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
diff --git a/src/cpu/amd/socket_S1G1/Kconfig b/src/cpu/amd/socket_S1G1/Kconfig
index 01d84a1d3a..3338677e5a 100644
--- a/src/cpu/amd/socket_S1G1/Kconfig
+++ b/src/cpu/amd/socket_S1G1/Kconfig
@@ -19,10 +19,6 @@ config DIMM_SUPPORT
 	hex
 	default 0x0204
 
-config CPU_ADDR_BITS
-	int
-	default 40
-
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000