Added mender support to u-boot

Makefile

@@ -35,6 +35,49 @@ define FW_ENV_OPIPLUS2E
 endef
 export FW_ENV_OPIPLUS2E
 
+opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender
+	tar xf u-boot-2018.05.tar.gz
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-serial-number-fix.patch
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-mender.patch
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-sunxi_wdt.patch
+	$(MAKE) -C u-boot-2018.05 orangepi_plus2e_defconfig
+	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2018.05/.config
+	@echo "CONFIG_WDT=y" >> u-boot-2018.05/.config
+	@echo "CONFIG_WDT_SUNXI=y" >> u-boot-2018.05/.config
+	$(MAKE) -C u-boot-2018.05 oldconfig
+	$(MAKE) -C u-boot-2018.05
+	mount /dev/$(DISK)1 /uboot
+	dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
+	dd if=u-boot-2018.05/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8
+	@echo "$$BOOTCMD_OPIPLUS2E_MENDER" > u-boot-2018.05/boot.cmd
+	u-boot-2018.05/tools/mkimage -C none -A arm -T script -d u-boot-2018.05/boot.cmd /uboot/boot.scr
+	$(MAKE) -C u-boot-2018.05 envtools
+	cp u-boot-2018.05/tools/env/fw_printenv /sbin/fw_printenv
+	ln -sf /sbin/fw_printenv /sbin/fw_setenv
+	@echo "$$FW_ENV_OPIPLUS2E_MENDER" > /etc/fw_env.config
+	/sbin/fw_setenv reset
+	umount /dev/$(DISK)1
+	rm -rf u-boot-2018.05
+
+opiplus2e-boot-cmd-mender:
+define BOOTCMD_OPIPLUS2E_MENDER
+run mender_setup
+load $${mender_uboot_root} $${kernel_addr_r} boot/zImage
+load $${mender_uboot_root} $${fdt_addr_r} boot/machine.dtb
+setenv bootargs console=tty1 panic=10 panic_on_oops=1 root=$${mender_kernel_root} rootfstype=ext4 ro rootwait elevator=noop sunxi-wdt.nowayout=1 quiet loglevel=3 systemd.show_status=1
+bootz $${kernel_addr_r} - $${fdt_addr_r}
+run mender_try_to_recover
+endef
+export BOOTCMD_OPIPLUS2E_MENDER
+
+opiplus2e-fw_env.config-mender:
+define FW_ENV_OPIPLUS2E_MENDER
+/dev/$(ROOT_DEVICE) 0x400000 0x20000
+/dev/$(ROOT_DEVICE) 0x800000 0x20000
+endef
+export FW_ENV_OPIPLUS2E_MENDER
+
 opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config
 	tar xf u-boot-2018.05.tar.gz
 	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-serial-number-fix.patch
@@ -72,6 +115,49 @@ define FW_ENV_OPIPCPLUS
 endef
 export FW_ENV_OPIPCPLUS
 
+opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender
+	tar xf u-boot-2018.05.tar.gz
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-serial-number-fix.patch
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-mender.patch
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-sunxi_wdt.patch
+	$(MAKE) -C u-boot-2018.05 orangepi_pc_plus_defconfig
+	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2018.05/.config
+	@echo "CONFIG_WDT=y" >> u-boot-2018.05/.config
+	@echo "CONFIG_WDT_SUNXI=y" >> u-boot-2018.05/.config
+	$(MAKE) -C u-boot-2018.05 oldconfig
+	$(MAKE) -C u-boot-2018.05
+	mount /dev/$(DISK)1 /uboot
+	dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
+	dd if=u-boot-2018.05/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8
+	@echo "$$BOOTCMD_OPIPCPLUS_MENDER" > u-boot-2018.05/boot.cmd
+	u-boot-2018.05/tools/mkimage -C none -A arm -T script -d u-boot-2018.05/boot.cmd /uboot/boot.scr
+	$(MAKE) -C u-boot-2018.05 envtools
+	cp u-boot-2018.05/tools/env/fw_printenv /sbin/fw_printenv
+	ln -sf /sbin/fw_printenv /sbin/fw_setenv
+	@echo "$$FW_ENV_OPIPCPLUS_MENDER" > /etc/fw_env.config
+	/sbin/fw_setenv reset
+	umount /dev/$(DISK)1
+	rm -rf u-boot-2018.05
+
+opipcplus-boot-cmd-mender:
+define BOOTCMD_OPIPCPLUS_MENDER
+run mender_setup
+load $${mender_uboot_root} $${kernel_addr_r} boot/zImage
+load $${mender_uboot_root} $${fdt_addr_r} boot/machine.dtb
+setenv bootargs console=tty1 panic=10 panic_on_oops=1 root=$${mender_kernel_root} rootfstype=ext4 ro rootwait elevator=noop sunxi-wdt.nowayout=1 quiet loglevel=3 systemd.show_status=1
+bootz $${kernel_addr_r} - $${fdt_addr_r}
+run mender_try_to_recover
+endef
+export BOOTCMD_OPIPCPLUS_MENDER
+
+opipcplus-fw_env.config-mender:
+define FW_ENV_OPIPCPLUS_MENDER
+/dev/$(ROOT_DEVICE) 0x400000 0x20000
+/dev/$(ROOT_DEVICE) 0x800000 0x20000
+endef
+export FW_ENV_OPIPCPLUS_MENDER
+
 rpi3b: rpi3b-boot-cmd rpi3b-fw_env.config rpi3b-config
 	tar xf u-boot-2018.05.tar.gz
 	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-serial-number-fix.patch
@@ -122,3 +208,58 @@ dtparam=spi=on
 avoid_warnings=2
 endef
 export RPI3CONFIG
+
+rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mender
+	tar xf u-boot-2018.05.tar.gz
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-serial-number-fix.patch
+	patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-mender.patch
+	$(MAKE) -C u-boot-2018.05 rpi_3_defconfig
+	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2018.05/.config
+	@echo "CONFIG_BCM2835_WDT=y" >> u-boot-2018.05/.config
+	$(MAKE) -C u-boot-2018.05 oldconfig
+	$(MAKE) -C u-boot-2018.05
+	mount /dev/$(DISK)1 /uboot
+	dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
+	cp u-boot-2018.05/u-boot.bin /uboot/u-boot.bin
+	@echo "$$BOOTCMD_RPI3_MENDER" > u-boot-2018.05/boot.cmd
+	u-boot-2018.05/tools/mkimage -C none -A arm -T script -d u-boot-2018.05/boot.cmd /uboot/boot.scr
+	@echo "$$RPI3CONFIG_MENDER" > /uboot/config.txt
+	tar xf rpi3-firmware.tar.xz --no-same-owner -C /uboot
+	$(MAKE) -C u-boot-2018.05 envtools
+	cp u-boot-2018.05/tools/env/fw_printenv /sbin/fw_printenv
+	ln -svf /sbin/fw_printenv /sbin/fw_setenv
+	@echo "$$FW_ENV_RPI3_MENDER" > /etc/fw_env.config
+	/sbin/fw_setenv reset
+	umount /dev/$(DISK)1
+	rm -rf u-boot-2018.05
+
+rpi3b-boot-cmd-mender:
+define BOOTCMD_RPI3_MENDER
+run mender_setup
+load $${mender_uboot_root} $${kernel_addr_r} boot/Image
+load $${mender_uboot_root} $${fdt_addr_r} boot/machine.dtb
+setenv bootargs console=tty1 panic=10 panic_on_oops=1 root=$${mender_kernel_root} rootfstype=ext4 ro rootwait elevator=noop bcm2835-wdt.nowayout=1 quiet loglevel=3 systemd.show_status=1
+booti $${kernel_addr_r} - $${fdt_addr_r}
+run mender_try_to_recover
+endef
+export BOOTCMD_RPI3_MENDER
+
+rpi3b-fw_env.config-mender:
+define FW_ENV_RPI3
+/dev/$(ROOT_DEVICE) 0x400000 0x20000
+/dev/$(ROOT_DEVICE) 0x800000 0x20000
+endef
+export FW_ENV_RPI3_MENDER
+
+rpi3b-config-mender:
+define RPI3CONFIG_MENDER
+enable_uart=1
+arm_control=0x200
+device_tree_address=0x100
+device_tree_end=0x8000
+kernel=u-boot.bin
+dtparam=i2c_arm=on
+dtparam=spi=on
+avoid_warnings=1
+endef
+export RPI3CONFIG_MENDER