Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 6165c891287783a71fab703722615918dbf94796

Authored by Marek Behún
Committed by Stefan Roese
1 parent 02aa5af922
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_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

arm: mvebu: turris_omnia: fix rescue mode bootcmd bootargs setting 

Rescue mode bootcmd currently only appends the "omniarescue" parameter
to the bootargs variable. We do not want the user to be able to change
rescue mode bootargs. Therefore change this so that bootcmd sets the
bootargs variable in an absolute way (adding console device information
and the omniarescue paramterer).

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

board/CZ.NIC/turris_omnia/turris_omnia.c
Diff comments   View file @ 6165c89
... ... @@ -340,7 +340,8 @@
340 340 "i2c mw 0x2a.1 0x4 0x1c 1; " \
341 341 "mw.l 0x01000000 0x00ff000c; " \
342 342 "i2c write 0x01000000 0x2a.1 0x5 4 -s; " \
343   - "setenv bootargs \"$bootargs omniarescue=$omnia_reset\"; " \
  343 + "setenv bootargs \"earlyprintk console=ttyS0,115200" \
  344 + " omniarescue=$omnia_reset\"; " \
344 345 "sf probe; " \
345 346 "sf read 0x1000000 0x100000 0x700000; " \
346 347 "bootm 0x1000000; " \