From: Marek Behún Date: Fri, 24 May 2019 12:57:54 +0000 (+0200) Subject: arm: mvebu: turris_omnia: fix rescue mode bootcmd bootargs setting X-Git-Tag: v2019.10-rc1~33^2~9 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6165c891287783a71fab703722615918dbf94796;p=oweals%2Fu-boot.git 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 Reviewed-by: Stefan Roese Signed-off-by: Stefan Roese --- diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index eee150892a..5f6ea35e5f 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -340,7 +340,8 @@ static int set_regdomain(void) "i2c mw 0x2a.1 0x4 0x1c 1; " \ "mw.l 0x01000000 0x00ff000c; " \ "i2c write 0x01000000 0x2a.1 0x5 4 -s; " \ - "setenv bootargs \"$bootargs omniarescue=$omnia_reset\"; " \ + "setenv bootargs \"earlyprintk console=ttyS0,115200" \ + " omniarescue=$omnia_reset\"; " \ "sf probe; " \ "sf read 0x1000000 0x100000 0x700000; " \ "bootm 0x1000000; " \