diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig
index 7f4cad8..e20c017 100644
--- a/board/keymile/Kconfig
+++ b/board/keymile/Kconfig
@@ -28,7 +28,7 @@
 
 config KM_RESERVED_PRAM
 	hex "Reserved RAM"
-	default 0x801000 if KIRKWOOD
+	default 0x801000 if ARCH_KIRKWOOD
 	default 0x0 if MPC83xx
 	default 0x1000 if MPC85xx
 	depends on !ARCH_SOCFPGA
@@ -37,7 +37,7 @@
 
 config KM_CRAMFS_ADDR
 	hex "CRAMFS Address"
-	default 0x2400000 if KIRKWOOD
+	default 0x2400000 if ARCH_KIRKWOOD
 	default 0xC00000 if MPC83xx
 	default 0x2000000 if MPC85xx
 	depends on !ARCH_SOCFPGA
@@ -46,7 +46,7 @@
 
 config KM_KERNEL_ADDR
 	hex "Kernel Load Address"
-	default 0x2000000 if KIRKWOOD
+	default 0x2000000 if ARCH_KIRKWOOD
 	default 0x400000 if MPC83xx
 	default 0x1000000 if MPC85xx || ARCH_SOCFPGA
 	help
@@ -54,7 +54,7 @@
 
 config KM_FDT_ADDR
 	hex "FDT Load Address"
-	default 0x23E0000 if KIRKWOOD || ARCH_SOCFPGA
+	default 0x23E0000 if ARCH_KIRKWOOD || ARCH_SOCFPGA
 	default 0xB80000 if MPC83xx
 	default 0x1F80000 if MPC85xx
 	help
@@ -74,7 +74,7 @@
 
 config KM_COMMON_ETH_INIT
 	bool "Common Ethernet Initialization"
-	default y if KIRKWOOD || MPC83xx
+	default y if ARCH_KIRKWOOD || MPC83xx
 	default n if MPC85xx || ARCH_SOCFPGA
 	help
 	  Use the Ethernet initialization implemented in common code, which
@@ -96,7 +96,7 @@
 config KM_IVM_BUS
 	int "IVM I2C Bus"
 	default 0 if ARCH_SOCFPGA
-	default 1 if KIRKWOOD || MPC85xx
+	default 1 if ARCH_KIRKWOOD || MPC85xx
 	default 2 if MPC83xx
 	help
 	  Identifier number of I2C bus, where the inventory EEPROM is connected to.