diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8c5d43d..13087e1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -374,35 +374,8 @@
 config TARGET_BCM958622HR
 	bool "Support bcm958622hr"
 
-config TARGET_ARNDALE
-	bool "Support arndale"
-
-config TARGET_ORIGEN
-	bool "Support origen"
-
-config TARGET_SMDK5250
-	bool "Support smdk5250"
-
-config TARGET_SNOW
-	bool "Support snow"
-
-config TARGET_PEACH_PIT
-	bool "Support peach-pit"
-
-config TARGET_SMDK5420
-	bool "Support smdk5420"
-
-config TARGET_SMDKV310
-	bool "Support smdkv310"
-
-config TARGET_TRATS
-	bool "Support trats"
-
-config TARGET_TRATS2
-	bool "Support trats2"
-
-config TARGET_S5PC210_UNIVERSAL
-	bool "Support s5pc210_universal"
+config ARCH_EXYNOS
+	bool "Samsung EXYNOS"
 
 config TARGET_HIGHBANK
 	bool "Support highbank"
@@ -659,6 +632,8 @@
 
 endchoice
 
+source "arch/arm/cpu/armv7/exynos/Kconfig"
+
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
 
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
@@ -796,17 +771,9 @@
 source "board/ronetix/pm9261/Kconfig"
 source "board/ronetix/pm9263/Kconfig"
 source "board/ronetix/pm9g45/Kconfig"
-source "board/samsung/arndale/Kconfig"
 source "board/samsung/goni/Kconfig"
-source "board/samsung/origen/Kconfig"
 source "board/samsung/smdk2410/Kconfig"
-source "board/samsung/smdk5250/Kconfig"
-source "board/samsung/smdk5420/Kconfig"
 source "board/samsung/smdkc100/Kconfig"
-source "board/samsung/smdkv310/Kconfig"
-source "board/samsung/trats/Kconfig"
-source "board/samsung/trats2/Kconfig"
-source "board/samsung/universal_c210/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/scb9328/Kconfig"
 source "board/schulercontrol/sc_sps_1/Kconfig"
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
new file mode 100644
index 0000000..f1cacdc
--- /dev/null
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -0,0 +1,55 @@
+if ARCH_EXYNOS
+
+choice
+	prompt "EXYNOS board select"
+
+config TARGET_SMDKV310
+	bool "Exynos4210 SMDKV310 board"
+
+config TARGET_TRATS
+	bool "Exynos4210 Trats board"
+
+config TARGET_S5PC210_UNIVERSAL
+	bool "EXYNOS4210 Universal C210 board"
+
+config TARGET_ORIGEN
+	bool "Exynos4412 Origen board"
+
+config TARGET_TRATS2
+	bool "Exynos4412 Trat2 board"
+
+config TARGET_ARNDALE
+	bool "Exynos5250 Arndale board"
+
+config TARGET_SMDK5250
+	bool "SMDK5250 board"
+
+config TARGET_SNOW
+	bool "Snow board"
+
+config TARGET_SMDK5420
+	bool "SMDK5420 board"
+
+config TARGET_PEACH_PIT
+	bool "Peach Pi board"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_SOC
+	string
+	default "exynos"
+
+source "board/samsung/smdkv310/Kconfig"
+source "board/samsung/trats/Kconfig"
+source "board/samsung/universal_c210/Kconfig"
+source "board/samsung/origen/Kconfig"
+source "board/samsung/trats2/Kconfig"
+source "board/samsung/arndale/Kconfig"
+source "board/samsung/smdk5250/Kconfig"
+source "board/samsung/smdk5420/Kconfig"
+
+endif