From: Alexander Holler <holler@ahsoftware.de>
Date: Mon, 14 Jul 2014 15:49:58 +0000 (+0200)
Subject: rpi_b: handle import of environments in files with CRLF as line endings
X-Git-Tag: v2014.10-rc1~96
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11547b299244418876bc70f149aa3b2dfae1698e;p=u-boot

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>
---

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 \