Skip to content
Snippets Groups Projects
Commit c547f1ef authored by Martin Strbacka's avatar Martin Strbacka
Browse files

turris: max6370_wdt_off command moved to another place.

parent bcfb33e4
No related merge requests found
......@@ -1130,8 +1130,8 @@ i2c mw 18 3 __SW_BOOT_MASK 1; reset
#define TURRIS_EXTRA_ENV \
"bootargsnor=root=/dev/mtdblock2 rw rootfstype=jffs2 console=ttyS0,115200\0" \
"bootargsubi=root=ubi0:rootfs rootfstype=ubifs ubi.mtd=9,2048 rootflags=chk_data_crc rw console=ttyS0,115200\0" \
"norboot=setenv bootargs $bootargsnor; bootm 0xef020000 - 0xef000000\0" \
"ubiboot=setenv bootargs $bootargsubi; ubi part rootfs; ubifsmount ubi0:rootfs; ubifsload $nandfdtaddr /boot/fdt; ubifsload $nandbootaddr /boot/zImage; bootm $nandbootaddr - $nandfdtaddr\0" \
"norboot=max6370_wdt_off; setenv bootargs $bootargsnor; bootm 0xef020000 - 0xef000000\0" \
"ubiboot=max6370_wdt_off; setenv bootargs $bootargsubi; ubi part rootfs; ubifsmount ubi0:rootfs; ubifsload $nandfdtaddr /boot/fdt; ubifsload $nandbootaddr /boot/zImage; bootm $nandbootaddr - $nandfdtaddr\0" \
"reflash_timeout=40\0"
#define CONFIG_NAND_BOOT_ADDR 2100000
#define CONFIG_NAND_FDT_ADDR 2000000
......@@ -1224,7 +1224,6 @@ __stringify(__PCIE_RST_CMD)"\0"
"bootm $loadaddr $ramdiskaddr $fdtaddr"
#define CONFIG_TURRIS_BOOT \
"max6370_wdt_off;" \
"setexpr.b reflash *0xFFA0001F;" \
"if test $reflash -ge $reflash_timeout; then echo BOOT NOR; run norboot; else echo BOOT NAND; run ubiboot; fi"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment