summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-08-29 11:06:26 -0400
committerTom Rini <trini@ti.com>2014-08-29 11:06:26 -0400
commit6af857c50df4e62ec08e51ad73c96f63f1480386 (patch)
tree15051533c1ed00d58dc0ed903904a4670b4f4bd4 /board
parentd1b60d34079b29be023115c5327ed209bf4969c5 (diff)
parentbf4ca384ad991c09cad7dd7838c1da6756c101b9 (diff)
downloadu-boot-imx-6af857c50df4e62ec08e51ad73c96f63f1480386.zip
u-boot-imx-6af857c50df4e62ec08e51ad73c96f63f1480386.tar.gz
u-boot-imx-6af857c50df4e62ec08e51ad73c96f63f1480386.tar.bz2
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
-rw-r--r--board/sunxi/Kconfig33
1 files changed, 8 insertions, 25 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index b06b5e0..c61c650 100644
--- 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 FTDFILE
+ string "Default ftdfile env setting for this board"
endif