Merge branch 'hotfix/turris1x-support' into develop

hardware/turris1x/turris1x-support/files/boot.txt

@@ -7,6 +7,7 @@ fi
 loaded=0
 for bootdir in ${prefix} ${boot_prefixes}; do
 	if test "${loaded}" != "1"; then
+		# In reality kernel image is in uImage format and not in zImage format
 		if test -e ${devtype} ${devnum}:${distro_bootpart} ${subvol}${bootdir}zImage && test -e ${devtype} ${devnum}:${distro_bootpart} ${subvol}${bootdir}${fdtfile}; then
 			echo "Found Kernel image ${subvol}${bootdir}zImage"
 			if load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${subvol}${bootdir}zImage; then
@@ -69,7 +70,12 @@ if test "${loaded}" = "1"; then
 		fdt addr ${fdt_addr_r}
 		fdt get value rootfsmtd /localbus@ffe05000/nand@1,0/partitions/partition@0 label || fdt get value rootfsmtd /localbus@ffe05000/nand@1,0/partition@00 label || setenv rootfsmtd rootfs
 		setenv bootfstype "ubifs"
-		setenv bootargs root=ubi0:${bootubivol} ubi.mtd=${rootfsmtd},2048
+		if test "${bootubioff}" != ""; then
+			setenv rootfsmtd ${rootfsmtd},${bootubioff}
+		else
+			setenv rootfsmtd ${rootfsmtd},2048
+		fi
+		setenv bootargs root=ubi0:${bootubivol} ubi.mtd=${rootfsmtd}
 		setenv rootfsmtd
 	else
 		part uuid ${devtype} ${devnum}:${distro_bootpart} partuuid
@@ -77,9 +83,8 @@ if test "${loaded}" = "1"; then
 	fi
 	setenv bootargs ${bootargs} rootfstype=${bootfstype} rootflags=${rootflags} rootwait rw cfg80211.freg=${regdomain} console=ttyS0,115200 ${quirks}
 
-	# Disable watchdog
+	# Disable watchdog (temporary workaround until the driver will land in kernel)
 	mw.b 0xffa00002 0x03
 
-	# In reality kernel image is in uImage format and not in zImage format
 	bootm ${kernel_addr_r} - ${fdt_addr_r}
 fi