diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 20b580c..8f5f423 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -334,8 +334,8 @@ config TARGET_BCM958622HR
 config ARCH_EXYNOS
 	bool "Samsung EXYNOS"
 
-config TARGET_HIGHBANK
-	bool "Support highbank"
+config ARCH_HIGHBANK
+	bool "Calxeda Highbank"
 
 config ARCH_KEYSTONE
 	bool "TI Keystone"
@@ -512,6 +512,8 @@ source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
 
 source "arch/arm/cpu/armv7/exynos/Kconfig"
 
+source "arch/arm/cpu/armv7/highbank/Kconfig"
+
 source "arch/arm/cpu/armv7/keystone/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
@@ -609,7 +611,6 @@ source "board/genesi/mx51_efikamx/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/hale/tt01/Kconfig"
-source "board/highbank/Kconfig"
 source "board/icpdas/lp8x4x/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
diff --git a/board/highbank/Kconfig b/arch/arm/cpu/armv7/highbank/Kconfig
similarity index 90%
rename from board/highbank/Kconfig
rename to arch/arm/cpu/armv7/highbank/Kconfig
index 1c32490..9527928 100644
--- a/board/highbank/Kconfig
+++ b/arch/arm/cpu/armv7/highbank/Kconfig
@@ -1,4 +1,4 @@
-if TARGET_HIGHBANK
+if ARCH_HIGHBANK
 
 config SYS_CPU
 	string
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 23fd52d..88efbdf 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -1,2 +1,2 @@
 CONFIG_ARM=y
-CONFIG_TARGET_HIGHBANK=y
+CONFIG_ARCH_HIGHBANK=y