diff --git a/src/cpu/amd/agesa/family14/Kconfig b/src/cpu/amd/agesa/family14/Kconfig
index 103903fc1e..a2790a1615 100644
--- a/src/cpu/amd/agesa/family14/Kconfig
+++ b/src/cpu/amd/agesa/family14/Kconfig
@@ -3,11 +3,3 @@
 config CPU_AMD_AGESA_FAMILY14
 	bool
 	select X86_AMD_FIXED_MTRRS
-
-if CPU_AMD_AGESA_FAMILY14
-
-config CPU_ADDR_BITS
-	int
-	default 36
-
-endif
diff --git a/src/cpu/amd/agesa/family15tn/Kconfig b/src/cpu/amd/agesa/family15tn/Kconfig
index 8c52e9a9b6..a0288d7bda 100644
--- a/src/cpu/amd/agesa/family15tn/Kconfig
+++ b/src/cpu/amd/agesa/family15tn/Kconfig
@@ -4,11 +4,3 @@ config CPU_AMD_AGESA_FAMILY15_TN
 	bool
 	select IDS_OPTIONS_HOOKED_UP
 	select X86_AMD_FIXED_MTRRS
-
-if CPU_AMD_AGESA_FAMILY15_TN
-
-config CPU_ADDR_BITS
-	int
-	default 48
-
-endif
diff --git a/src/cpu/amd/agesa/family16kb/Kconfig b/src/cpu/amd/agesa/family16kb/Kconfig
index e41ddece4d..08e8009894 100644
--- a/src/cpu/amd/agesa/family16kb/Kconfig
+++ b/src/cpu/amd/agesa/family16kb/Kconfig
@@ -6,10 +6,6 @@ config CPU_AMD_AGESA_FAMILY16_KB
 
 if CPU_AMD_AGESA_FAMILY16_KB
 
-config CPU_ADDR_BITS
-	int
-	default 40
-
 config FORCE_AM1_SOCKET_SUPPORT
 	bool
 	default n
diff --git a/src/cpu/amd/pi/00730F01/Kconfig b/src/cpu/amd/pi/00730F01/Kconfig
index 5296ee6399..6fd6332eec 100644
--- a/src/cpu/amd/pi/00730F01/Kconfig
+++ b/src/cpu/amd/pi/00730F01/Kconfig
@@ -5,11 +5,3 @@ config CPU_AMD_PI_00730F01
 	select X86_AMD_FIXED_MTRRS
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select MICROCODE_BLOB_UNDISCLOSED
-
-if CPU_AMD_PI_00730F01
-
-config CPU_ADDR_BITS
-	int
-	default 40
-
-endif
diff --git a/src/cpu/intel/model_106cx/Kconfig b/src/cpu/intel/model_106cx/Kconfig
index ac45cfafe2..76e0423dd0 100644
--- a/src/cpu/intel/model_106cx/Kconfig
+++ b/src/cpu/intel/model_106cx/Kconfig
@@ -11,11 +11,3 @@ config CPU_INTEL_MODEL_106CX
 	select SERIALIZED_SMM_INITIALIZATION
 	select CPU_INTEL_COMMON
 	select CPU_INTEL_COMMON_TIMEBASE
-
-if CPU_INTEL_MODEL_106CX
-
-config CPU_ADDR_BITS
-	int
-	default 32
-
-endif
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index fb5b5413b9..44c9cb6f17 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -90,10 +90,6 @@ config SETUP_XIP_CACHE
 	  non-eviction mode and therefore need to be careful to avoid
 	  eviction.
 
-config CPU_ADDR_BITS
-	int
-	default 36
-
 config LOGICAL_CPUS
 	bool
 	default y
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index c2423cd5ab..65bf2bf001 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -204,10 +204,6 @@ config RO_REGION_ONLY
 	depends on VBOOT_SLOTS_RW_AB || VBOOT_SLOTS_RW_A
 	default "apu/amdfw"
 
-config CPU_ADDR_BITS
-	int
-	default 48
-
 config MMCONF_BASE_ADDRESS
 	default 0xF8000000
 
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 5d1c0d4904..6fc482519b 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -200,10 +200,6 @@ config RAMBASE
 	hex
 	default 0x10000000
 
-config CPU_ADDR_BITS
-	int
-	default 48
-
 config MMCONF_BASE_ADDRESS
 	default 0xF8000000
 
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index 36eecb122f..ec36b34b7d 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -108,10 +108,6 @@ config PRERAM_CBMEM_CONSOLE_SIZE
 	help
 	  Increase this value if preram cbmem console is getting truncated
 
-config CPU_ADDR_BITS
-	int
-	default 48
-
 config BOTTOMIO_POSITION
 	hex "Bottom of 32-bit IO space"
 	default 0xD0000000
diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index dca95e3518..9f1cb8e820 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -50,10 +50,6 @@ config MAX_CPUS
 	int
 	default 4
 
-config CPU_ADDR_BITS
-	int
-	default 36
-
 config SMM_TSEG_SIZE
 	hex
 	default 0x800000
diff --git a/src/soc/intel/xeon_sp/cpx/Kconfig b/src/soc/intel/xeon_sp/cpx/Kconfig
index 3c879438a6..bac7bdbc9d 100644
--- a/src/soc/intel/xeon_sp/cpx/Kconfig
+++ b/src/soc/intel/xeon_sp/cpx/Kconfig
@@ -20,10 +20,6 @@ config MAX_CPUS
 	int
 	default 255
 
-config CPU_ADDR_BITS
-	int
-	default 46
-
 config PCR_BASE_ADDRESS
 	hex
 	default 0xfd000000
diff --git a/src/soc/intel/xeon_sp/skx/Kconfig b/src/soc/intel/xeon_sp/skx/Kconfig
index 528f415551..444968d603 100644
--- a/src/soc/intel/xeon_sp/skx/Kconfig
+++ b/src/soc/intel/xeon_sp/skx/Kconfig
@@ -15,10 +15,6 @@ config MAX_SOCKET
 	int
 	default 2
 
-config CPU_ADDR_BITS
-	int
-	default 46
-
 # For 2S config, the number of cpus could be as high as
 # 2 threads * 20 cores * 2 sockets
 config MAX_CPUS