diff mbox series

fsl-layerscape/soc.c: do not destroy bootcmd environment

Message ID 20240130142656.200683-1-mike.looijmans@topic.nl
State Accepted
Commit 121696c957d741d17125f5416d1210b11ef8afdd
Delegated to: Peng Fan
Headers show
Series fsl-layerscape/soc.c: do not destroy bootcmd environment | expand

Commit Message

Mike Looijmans Jan. 30, 2024, 2:26 p.m. UTC 
When an XXX_BOOTCOMMAND isn't defined, the result is that bootcmd is set
to some random memory content. Fix it so that the function does nothing
in that case and leaves the bootcmd environment unmodified.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>

---

 arch/arm/cpu/armv8/fsl-layerscape/soc.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Dan Carpenter Jan. 30, 2024, 2:48 p.m. UTC | #1 
On Tue, Jan 30, 2024 at 03:26:56PM +0100, Mike Looijmans wrote:
> When an XXX_BOOTCOMMAND isn't defined, the result is that bootcmd is set
> to some random memory content. Fix it so that the function does nothing
> in that case and leaves the bootcmd environment unmodified.
> 
> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>

Thanks, Mike.

Fixes: 2141d250f510 ("armv8: fsl-layerscape: bootcmd identification for TFABOOT")

Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>

regards,
dan carpenter
diff mbox series

Patch

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 3bfdc3f774..4c61d28c20 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -811,6 +811,8 @@  __weak int fsl_setenv_bootcmd(void)
 	enum boot_src src = get_boot_src();
 	char bootcmd_str[MAX_BOOTCMD_SIZE];
 
+	bootcmd_str[0] = 0;
+
 	switch (src) {
 #ifdef IFC_NOR_BOOTCOMMAND
 	case BOOT_SOURCE_IFC_NOR:
@@ -859,6 +861,9 @@  __weak int fsl_setenv_bootcmd(void)
 		break;
 	}
 
+	if (!bootcmd_str[0])
+		return 0;
+
 	ret = env_set("bootcmd", bootcmd_str);
 	if (ret) {
 		printf("Failed to set bootcmd: ret = %d\n", ret);