diff --git a/src/Kconfig b/src/Kconfig
index 834249ae49..0f87099808 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -302,9 +302,10 @@ config HEAP_SIZE
 	hex "Heap size in bytes"
 	default 0x4000
 
-# Not used for the actual stack by ARM, but still needed in some src/lib/ files.
+# Size of per-cpu stacks in ramstage. Set to 0 for non-SMP architectures.
 config STACK_SIZE
 	hex
+	default 0x0 if (ARCH_RAMSTAGE_ARM || ARCH_RAMSTAGE_MIPS)
 	default 0x1000
 
 config MAX_CPUS
diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig
index ded5911591..25d959c2c2 100644
--- a/src/arch/arm/Kconfig
+++ b/src/arch/arm/Kconfig
@@ -30,9 +30,4 @@ config ARM_LPAE
 	bool "Enable LPAE"
 	default n
 
-# Mark SMP stack size as 0 since we keep using SRAM stack throughout ramstage.
-config STACK_SIZE
-	hex
-	default 0x0
-
 endmenu
diff --git a/src/arch/mips/Kconfig b/src/arch/mips/Kconfig
index b73244c37e..3d8e2c6bac 100644
--- a/src/arch/mips/Kconfig
+++ b/src/arch/mips/Kconfig
@@ -34,9 +34,4 @@ config ARCH_RAMSTAGE_MIPS
 	bool
 	default n
 
-# Mark SMP stack size as 0 since we keep using SRAM stack throughout ramstage.
-config STACK_SIZE
-	hex
-	default 0x0
-
 endmenu