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

[platform/kernel/u-boot.git] / board / sunxi / Kconfig

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index b06b5e0..7bdf958 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -1,17 +1,5 @@
 if TARGET_SUN4I
 
-config SYS_CPU
-       string
-       default "armv7"
-
-config SYS_BOARD
-       string
-       default "sunxi"
-
-config SYS_SOC
-       string
-       default "sunxi"
-
 config SYS_CONFIG_NAME
        string
        default "sun4i"
@@ -20,25 +8,21 @@ endif
 
 if TARGET_SUN5I
 
-config SYS_CPU
+config SYS_CONFIG_NAME
        string
-       default "armv7"
+       default "sun5i"
 
-config SYS_BOARD
-       string
-       default "sunxi"
+endif
 
-config SYS_SOC
-       string
-       default "sunxi"
+if TARGET_SUN7I
 
 config SYS_CONFIG_NAME
        string
-       default "sun5i"
+       default "sun7i"
 
 endif
 
-if TARGET_SUN7I
+if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN7I
 
 config SYS_CPU
        string
@@ -52,8 +36,7 @@ config SYS_SOC
        string
        default "sunxi"
 
-config SYS_CONFIG_NAME
-       string
-       default "sun7i"
+config FDTFILE
+       string "Default fdtfile env setting for this board"
 
 endif