summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-06-28 17:02:25 -0400
committerTom Rini <[email protected]>2022-06-28 17:02:25 -0400
commita063429c17616007f6c48aaa293683402ae6ea56 (patch)
treee74c9a7ba57c7375f26dd0c5c582d46e5f05b7e4 /include
parentb75fd37037bcca8a5e86f1648e8fb4e97cba345a (diff)
parent0c4db621e265c780833af4152a99398aed482f61 (diff)
Merge branch '2022-06-28-assorted-fixes'
- Fix a squashfs security issue, an i2c access security issue and fix NAND booting on imx8mn_bsh_smm_s2
Diffstat (limited to 'include')
-rw-r--r--include/configs/imx8mn_bsh_smm_s2.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h
index 098f23b206d..d09c2ab0161 100644
--- a/include/configs/imx8mn_bsh_smm_s2.h
+++ b/include/configs/imx8mn_bsh_smm_s2.h
@@ -16,8 +16,9 @@
#define NANDARGS \
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
- "nandargs=setenv bootargs console=${console} " \
+ "nandargs=setenv bootargs " \
"${optargs} " \
+ "mtdparts=${mtdparts} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
"nandroot=ubi0:root rw ubi.mtd=nandrootfs\0" \