summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlexander Holler <holler@ahsoftware.de>2014-07-14 17:49:58 +0200
committerTom Rini <trini@ti.com>2014-07-22 07:44:26 -0400
commit11547b299244418876bc70f149aa3b2dfae1698e (patch)
tree5d920a81df2c582db22204e3844876121347e223 /include
parent4cfe8c3eddb3fd52743bb82610be56c7cd487492 (diff)
downloadtalos-obmc-uboot-11547b299244418876bc70f149aa3b2dfae1698e.tar.gz
talos-obmc-uboot-11547b299244418876bc70f149aa3b2dfae1698e.zip
rpi_b: handle import of environments in files with CRLF as line endings
Use the new option -r for env import. Signed-off-by: Alexander Holler <holler@ahsoftware.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/rpi_b.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h
index ff48598dd5..60f24895e5 100644
--- a/include/configs/rpi_b.h
+++ b/include/configs/rpi_b.h
@@ -98,7 +98,7 @@
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_PREBOOT \
"if load mmc 0:1 ${loadaddr} /uEnv.txt; then " \
- "env import -t ${loadaddr} ${filesize}; " \
+ "env import -t -r ${loadaddr} ${filesize}; " \
"fi"
#define ENV_DEVICE_SETTINGS \
OpenPOWER on IntegriCloud