summaryrefslogtreecommitdiff
path: root/include/configs/sunxi-common.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-09-12 11:27:46 -0400
committerTom Rini <trini@ti.com>2014-09-12 11:27:46 -0400
commit114cc4290b2f24bb314edf2edd5d8738a0778c4b (patch)
treee3ca947656fea69adb810bab0ee5a32c0d413919 /include/configs/sunxi-common.h
parentb7a809957bcd72c2efa49ce733774b1e28878585 (diff)
parenta7f99bf139b3aaa0d5494693fd0395084355e41a (diff)
downloadu-boot-114cc4290b2f24bb314edf2edd5d8738a0778c4b.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/sunxi-common.h')
-rw-r--r--include/configs/sunxi-common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index e768921383..1d947d7d9e 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -244,7 +244,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
- "fdtfile=" CONFIG_FTDFILE "\0" \
+ "fdtfile=" CONFIG_FDTFILE "\0" \
"console=ttyS0,115200\0" \
BOOTENV