|
226 | 226 | #define CONFIG_ENV_SPI_BUS 1
|
227 | 227 | #define CONFIG_ENV_SPI_CS 0
|
228 | 228 |
|
| 229 | +#define UPGRADE_CHECK_RESET \ |
| 230 | + "if test ${attempt_upgrade} -eq 1; then " \ |
| 231 | + "reset; " \ |
| 232 | + "fi;" |
229 | 233 | #define USB_BOOTCOMMAND \
|
230 | 234 | "sf probe 1:0;" \
|
231 | 235 | "mtdparts default;" \
|
|
270 | 274 | "setenv bootargs $console $earlycon $nandroot $bootextra $mtdparts panic=2;" \
|
271 | 275 | "setenv verify n;" \
|
272 | 276 | "ubi part firmware${boot_partition};" \
|
273 |
| - "ubifsmount ubi:rootfs;" \ |
274 |
| - "ubifsload $loadaddr $bootdir$bootfile;" \ |
275 |
| - "ubifsload $fdtaddr $bootdir$fdtfile;" \ |
276 |
| - "bootm $loadaddr - $fdtaddr;" |
| 277 | + "setenv ubifs_bootm_cmd \"ubifsmount ubi:rootfs && " \ |
| 278 | + "ubifsload $loadaddr $bootdir$bootfile && " \ |
| 279 | + "ubifsload $fdtaddr $bootdir$fdtfile && " \ |
| 280 | + "bootm $loadaddr - $fdtaddr\";" \ |
| 281 | + "run ubifs_bootm_cmd" |
| 282 | + |
| 283 | +#define DUAL_NAND_BOOTCOMMAND_RESET \ |
| 284 | + DUAL_NAND_BOOTCOMMAND " || " UPGRADE_CHECK_RESET |
277 | 285 |
|
278 | 286 | #ifdef CONFIG_BOOTCOUNT_LIMIT
|
279 | 287 |
|
|
329 | 337 |
|
330 | 338 | #else
|
331 | 339 |
|
332 |
| -#define CONFIG_BOOTCOMMAND DUAL_NAND_BOOTCOMMAND |
| 340 | +#define CONFIG_BOOTCOMMAND DUAL_NAND_BOOTCOMMAND_RESET |
333 | 341 |
|
334 | 342 | #endif
|
335 | 343 |
|
|
355 | 363 | "nandboot="NAND_BOOTCOMMAND"\0" \
|
356 | 364 | "ethboot="ETH_BOOTCOMMAND"\0" \
|
357 | 365 | "netboot="NET_BOOTCOMMAND"\0" \
|
358 |
| - "dualnandboot="DUAL_NAND_BOOTCOMMAND"\0" \ |
| 366 | + "dualnandboot="DUAL_NAND_BOOTCOMMAND_RESET"\0" \ |
359 | 367 | BOOTCOUNT_VARIABLES \
|
360 | 368 | "u_memload=0x00800000\0" \
|
361 | 369 | "u_memsize=0x08000000\0" \
|
|
0 commit comments