Merge branch 'master' of git://git.denx.de/u-boot-ti

[karo-tx-uboot.git] / arch / arm / cpu / arm926ejs / kirkwood / Kconfig

diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
index 91ffedf732b06df284c0ef25a90f2c3b7b083f07..45c6687d0bddbfc69fe9eaaf485c02b5ee1bdfff 100644 (file)
--- a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
+++ b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
@@ -57,10 +57,10 @@ config TARGET_DOCKSTAR
 config TARGET_GOFLEXHOME
        bool "GoFlex Home Board"
 
-endchoice
+config TARGET_NAS220
+       bool "BlackArmor NAS220"
 
-config SYS_CPU
-       default "arm926ejs"
+endchoice
 
 config SYS_SOC
        default "kirkwood"
@@ -83,5 +83,6 @@ source "board/LaCie/wireless_space/Kconfig"
 source "board/raidsonic/ib62x0/Kconfig"
 source "board/Seagate/dockstar/Kconfig"
 source "board/Seagate/goflexhome/Kconfig"
+source "board/Seagate/nas220/Kconfig"
 
 endif