Fixed mender configurations

Makefile

@@ -41,8 +41,16 @@ opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender
 	patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_wdt.patch
 	$(MAKE) -C u-boot-2020.04 orangepi_plus2e_defconfig
 	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
+	@echo "# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set" >> u-boot-2020.04/.config
 	@echo "CONFIG_WDT=y" >> u-boot-2020.04/.config
+	@echo "# CONFIG_CMD_WDT is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_AT91 is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_CDNS is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_CORTINA is not set" >> u-boot-2020.04/.config
 	@echo "CONFIG_WDT_SUNXI=y" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_SP805 is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_STM32MP is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_XILINX_TB_WATCHDOG is not set" >> u-boot-2020.04/.config
 	$(MAKE) -C u-boot-2020.04 oldconfig
 	$(MAKE) -C u-boot-2020.04
 	mount /dev/$(DISK)1 /uboot
@@ -119,8 +127,16 @@ opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender
 	patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_wdt.patch
 	$(MAKE) -C u-boot-2020.04 orangepi_pc_plus_defconfig
 	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
+	@echo "# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set" >> u-boot-2020.04/.config
 	@echo "CONFIG_WDT=y" >> u-boot-2020.04/.config
+	@echo "# CONFIG_CMD_WDT is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_AT91 is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_CDNS is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_CORTINA is not set" >> u-boot-2020.04/.config
 	@echo "CONFIG_WDT_SUNXI=y" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_SP805 is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_WDT_STM32MP is not set" >> u-boot-2020.04/.config
+	@echo "# CONFIG_XILINX_TB_WATCHDOG is not set" >> u-boot-2020.04/.config
 	$(MAKE) -C u-boot-2020.04 oldconfig
 	$(MAKE) -C u-boot-2020.04
 	mount /dev/$(DISK)1 /uboot
@@ -187,6 +203,7 @@ export FW_ENV_TERASICDE10STANDARD
 
 terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10standard-fw_env.config-mender
 	tar xf u-boot-2020.04.tar.bz2
+	patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
 	$(MAKE) -C u-boot-2020.04 socfpga_de10_nano_defconfig
 	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
 	$(MAKE) -C u-boot-2020.04 oldconfig
@@ -277,6 +294,7 @@ rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mend
 	patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
 	$(MAKE) -C u-boot-2020.04 rpi_3_defconfig
 	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
+	@echo "# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set" >> u-boot-2020.04/.config
 	@echo "CONFIG_BCM2835_WDT=y" >> u-boot-2020.04/.config
 	$(MAKE) -C u-boot-2020.04 oldconfig
 	$(MAKE) -C u-boot-2020.04
@@ -378,6 +396,7 @@ amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-men
 	patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-boot_from_mmc1.patch
 	$(MAKE) -C u-boot-2020.04 p212_defconfig
 	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
+	@echo "# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set" >> u-boot-2020.04/.config
 	$(MAKE) -C u-boot-2020.04 oldconfig
 	$(MAKE) -C u-boot-2020.04
 	tar xf amlogics905x-firmware.tar.xz -C u-boot-2020.04

u-boot-2020.04-mender.patch

@@ -42,7 +42,7 @@ diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig
 -	default 0x140000 if ARCH_AT91
 -	default 0x260000 if ARCH_OMAP2PLUS
 +	hex "Environment Offset will be set by mender patch"
-+	depends on !ARCH_SUNXI
++	depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X
  	help
  	  Offset from the start of the device (or partition)