diff --git a/src/arch/mips/Kconfig b/src/arch/mips/Kconfig
index 9e51d9cf13..b8570c1c5d 100644
--- a/src/arch/mips/Kconfig
+++ b/src/arch/mips/Kconfig
@@ -16,12 +16,12 @@
 
 config ARCH_MIPS
 	bool
-	default n
+
+if ARCH_MIPS
 
 config ARCH_BOOTBLOCK_MIPS
 	bool
 	default n
-	select ARCH_MIPS
 	select BOOTBLOCK_CUSTOM
 	select C_ENVIRONMENT_BOOTBLOCK
 
@@ -36,3 +36,5 @@ config ARCH_ROMSTAGE_MIPS
 config ARCH_RAMSTAGE_MIPS
 	bool
 	default n
+
+endif # if ARCH_MIPS
diff --git a/src/soc/imgtec/pistachio/Kconfig b/src/soc/imgtec/pistachio/Kconfig
index 333216d15d..40b63c3d5a 100644
--- a/src/soc/imgtec/pistachio/Kconfig
+++ b/src/soc/imgtec/pistachio/Kconfig
@@ -15,6 +15,7 @@
 #
 
 config CPU_IMGTEC_PISTACHIO
+	select ARCH_MIPS
 	select ARCH_BOOTBLOCK_MIPS
 	select ARCH_VERSTAGE_MIPS
 	select ARCH_ROMSTAGE_MIPS