|
98 | 98 | "bootcmd_qspi=ubi detach; sf probe && " \ |
99 | 99 | "setenv mtdids 'nor0=nor0,nand0=nand.0' && " \ |
100 | 100 | "setenv mtdparts 'mtdparts=nor0:66m(u-boot),190m(root);nand.0:2m(nand_uboot),500m(nand_root)' && " \ |
101 | | -"env select UBI; saveenv && " \ |
102 | | -"ubi part root && " \ |
103 | | -"if ubi part root && ubi readvol ${scriptaddr} script; " \ |
104 | | -"then echo QSPI: Running script from UBIFS; " \ |
105 | | -"elif sf read ${scriptaddr} ${qspiscriptaddr} ${scriptsize}; " \ |
106 | | -"then echo QSPI: Running script from JFFS2; fi; " \ |
| 101 | +"env select UBI && " \ |
| 102 | +"if ubi part root && ubi readvol ${scriptaddr} script; then " \ |
| 103 | +"echo QSPI: Running script from UBIFS; " \ |
| 104 | +"elif sf read ${scriptaddr} ${qspiscriptaddr} ${scriptsize}; then " \ |
| 105 | +"echo QSPI: Running script from JFFS2; " \ |
| 106 | +"source ${scriptaddr}; " \ |
| 107 | +"echo QSPI: UBIFS/JFFS2 load failed, trying fallback layout...; " \ |
| 108 | +"setenv mtdids 'nor0=nor0' && " \ |
| 109 | +"setenv mtdparts 'mtdparts=nor0:6m(u-boot),58m(root)' && " \ |
| 110 | +"env select UBI && " \ |
| 111 | +"if ubi part root && ubi readvol ${scriptaddr} script; then " \ |
| 112 | +"echo QSPI: Running script from UBIFS fallback; " \ |
| 113 | +"elif sf read ${scriptaddr} ${qspiscriptaddr} ${scriptsize}; then " \ |
| 114 | +"echo QSPI: Running script from JFFS2 fallback; " \ |
| 115 | +"fi; " \ |
| 116 | +"fi; " \ |
107 | 117 | "echo QSPI: Trying to boot script at ${scriptaddr} && " \ |
108 | 118 | "source ${scriptaddr}; " \ |
109 | 119 | "echo QSPI: SCRIPT FAILED: continuing...; ubi detach;\0" |
|
0 commit comments