Commit
44bd26fa99fb6d7c1d98c9e8d0bc0c5ac51c04bf
Exists in
v2017.01-smarct4x
and in
39 other branches
8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc
omap3_beagle: 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>
Showing
1 changed file
with
1 additions
and
1 deletions
Side-by-side Diff
| ... |
... |
@@ -195,7 +195,7 @@ |
|
195
|
195 |
"bootenv=uEnv.txt\0" \ |
|
196
|
196 |
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ |
|
197
|
197 |
"importbootenv=echo Importing environment from mmc ...; " \ |
|
198
|
|
- "env import -t $loadaddr $filesize$loadaddr $filesize\0" \" \ |
|
|
198 |
+ "env import -t -r $loadaddr $filesize$loadaddr $filesize\0" \" \ |
|
199
|
199 |
"ramargs=setenv bootargs console=${console} " \ |
|
200
|
200 |
"${optargs} " \ |
|
201
|
201 |
"mpurate=${mpurate} " \ |
Tom Rini