From be0386826c62e8dc803c8ed39d5eb27299036dd2 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Thu, 2 Jun 2022 03:57:52 -0700 Subject: [PATCH] configs: am6*_evm/j721e_evm: prevent optargs from getting overwritten Fix issue that saved optargs was getting overwritten when 'run args_all' was called. This was a issue in all K3 based configurations and is resolved by prepending the original optargs when set with args_all. Signed-off-by: Matt Ranostay --- include/configs/am62x_evm.h | 4 ++-- include/configs/am64x_evm.h | 4 ++-- include/configs/am65x_evm.h | 4 ++-- include/configs/j721e_evm.h | 4 ++-- include/configs/j721s2_evm.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h index f6a0bc4275..40a12e26dd 100644 --- a/include/configs/am62x_evm.h +++ b/include/configs/am62x_evm.h @@ -172,8 +172,8 @@ "setenv fdtfile ${name_fdt}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \ - "${mtdparts}\0" \ + "args_all=setenv optargs ${optargs} " \ + "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" /* U-Boot MMC-specific configuration */ diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index c31461f394..1f4078c596 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -114,8 +114,8 @@ "echo WARNING: Could not determine device tree to use; fi; \0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \ - "${mtdparts}\0" \ + "args_all=setenv optargs ${optargs} " \ + "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" /* U-Boot MMC-specific configuration */ diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 78d9ed226c..e454511208 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -69,8 +69,8 @@ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ "stdin=serial,usbkbd\0" \ - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \ - "${mtdparts}\0" \ + "args_all=setenv optargs ${optargs} " \ + "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" \ /* U-Boot MMC-specific configuration */ diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 10bb1ebea8..145109da29 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -87,8 +87,8 @@ "setenv fdtfile ${name_fdt}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \ - "${mtdparts}\0" \ + "args_all=setenv optargs ${optargs} " \ + "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" #define PARTS_DEFAULT \ diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h index 318b6a75da..c0a2b8af7c 100644 --- a/include/configs/j721s2_evm.h +++ b/include/configs/j721s2_evm.h @@ -70,8 +70,8 @@ "setenv fdtfile ${name_fdt}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02880000 " \ - "${mtdparts}\0" \ + "args_all=setenv optargs ${optargs} " \ + "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" #define PARTS_DEFAULT \