Fixed u-boot configuration for mender

Makefile

@@ -41,7 +41,7 @@ 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_SYS_REDUNDAND_ENVIRONMENT=y" >> 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
@@ -127,7 +127,7 @@ 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_SYS_REDUNDAND_ENVIRONMENT=y" >> 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
@@ -206,6 +206,7 @@ terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10stand
 	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
+	@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config
 	$(MAKE) -C u-boot-2020.04 oldconfig
 	$(MAKE) -C u-boot-2020.04
 	dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
@@ -294,7 +295,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_SYS_REDUNDAND_ENVIRONMENT=y" >> 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
@@ -396,7 +397,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
+	@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> 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

 diff -uNr u-boot-2020.04/configs/p212_defconfig u-boot-2020.04-mender/configs/p212_defconfig
 --- u-boot-2020.04/configs/p212_defconfig	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/configs/p212_defconfig	2020-05-30 20:33:19.766074670 +0930
++++ u-boot-2020.04-mender/configs/p212_defconfig	2020-06-06 18:51:53.318459521 +0930
 @@ -1,7 +1,7 @@
  CONFIG_ARM=y
  CONFIG_ARCH_MESON=y
@@ -12,7 +12,7 @@ diff -uNr u-boot-2020.04/configs/p212_defconfig u-boot-2020.04-mender/configs/p2
  CONFIG_NR_DRAM_BANKS=1
 diff -uNr u-boot-2020.04/configs/rpi_3_defconfig u-boot-2020.04-mender/configs/rpi_3_defconfig
 --- u-boot-2020.04/configs/rpi_3_defconfig	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/configs/rpi_3_defconfig	2020-05-30 20:35:38.147421723 +0930
++++ u-boot-2020.04-mender/configs/rpi_3_defconfig	2020-06-06 18:51:53.319459525 +0930
 @@ -4,7 +4,7 @@
  CONFIG_SYS_TEXT_BASE=0x00080000
  CONFIG_TARGET_RPI_3=y
@@ -24,8 +24,8 @@ diff -uNr u-boot-2020.04/configs/rpi_3_defconfig u-boot-2020.04-mender/configs/r
  CONFIG_OF_BOARD_SETUP=y
 diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig
 --- u-boot-2020.04/env/Kconfig	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/env/Kconfig	2020-05-30 20:21:45.096362246 +0930
-@@ -488,18 +488,8 @@
++++ u-boot-2020.04-mender/env/Kconfig	2020-06-06 18:52:58.041670408 +0930
+@@ -488,25 +488,14 @@
  	  environment location.
  
  config ENV_OFFSET
@@ -46,9 +46,18 @@ diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig
  	help
  	  Offset from the start of the device (or partition)
  
+ config ENV_OFFSET_REDUND
+-	hex "Redundant environment offset"
+-	depends on (ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \
+-		    ENV_IS_IN_SPI_FLASH) && SYS_REDUNDAND_ENVIRONMENT
++	hex "Redundant Environment Offset will be set by mender patch"
++	depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X
+ 	help
+ 	  Offset from the start of the device (or partition) of the redundant
+ 	  environment location.
 diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-mender/include/config_mender_defines.h
 --- u-boot-2020.04/include/config_mender_defines.h	1970-01-01 09:30:00.000000000 +0930
-+++ u-boot-2020.04-mender/include/config_mender_defines.h	2020-05-30 20:14:13.527252484 +0930
++++ u-boot-2020.04-mender/include/config_mender_defines.h	2020-06-06 18:51:53.320459528 +0930
 @@ -0,0 +1,17 @@
 +/* Shell variables */
 +#define MENDER_BOOT_PART_NUMBER 1
@@ -69,7 +78,7 @@ diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-mender/i
 +#define MENDER_BOOTENV_SIZE 0x20000
 diff -uNr u-boot-2020.04/include/config_mender.h u-boot-2020.04-mender/include/config_mender.h
 --- u-boot-2020.04/include/config_mender.h	1970-01-01 09:30:00.000000000 +0930
-+++ u-boot-2020.04-mender/include/config_mender.h	2020-05-30 20:14:13.527252484 +0930
++++ u-boot-2020.04-mender/include/config_mender.h	2020-06-06 18:51:53.320459528 +0930
 @@ -0,0 +1,83 @@
 +/*
 +  Copyright 2017 Northern.tech AS
@@ -156,7 +165,7 @@ diff -uNr u-boot-2020.04/include/config_mender.h u-boot-2020.04-mender/include/c
 +#endif /* HEADER_CONFIG_MENDER_H */
 diff -uNr u-boot-2020.04/include/configs/meson64.h u-boot-2020.04-mender/include/configs/meson64.h
 --- u-boot-2020.04/include/configs/meson64.h	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/include/configs/meson64.h	2020-05-30 20:31:28.306795518 +0930
++++ u-boot-2020.04-mender/include/configs/meson64.h	2020-06-06 18:51:53.320459528 +0930
 @@ -37,6 +37,8 @@
  
  #define CONFIG_CPU_ARMV8
@@ -168,7 +177,7 @@ diff -uNr u-boot-2020.04/include/configs/meson64.h u-boot-2020.04-mender/include
  #define CONFIG_SYS_CBSIZE		1024
 diff -uNr u-boot-2020.04/include/configs/rpi.h u-boot-2020.04-mender/include/configs/rpi.h
 --- u-boot-2020.04/include/configs/rpi.h	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/include/configs/rpi.h	2020-05-30 20:31:51.976854499 +0930
++++ u-boot-2020.04-mender/include/configs/rpi.h	2020-06-06 18:51:53.321459531 +0930
 @@ -97,6 +97,8 @@
  #define CONFIG_SYS_CBSIZE		1024
  
@@ -180,7 +189,7 @@ diff -uNr u-boot-2020.04/include/configs/rpi.h u-boot-2020.04-mender/include/con
  /* Shell */
 diff -uNr u-boot-2020.04/include/configs/sun8i.h u-boot-2020.04-mender/include/configs/sun8i.h
 --- u-boot-2020.04/include/configs/sun8i.h	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/include/configs/sun8i.h	2020-05-30 20:14:13.528252487 +0930
++++ u-boot-2020.04-mender/include/configs/sun8i.h	2020-06-06 18:51:53.321459531 +0930
 @@ -17,4 +17,7 @@
   */
  #include <configs/sunxi-common.h>
@@ -191,7 +200,7 @@ diff -uNr u-boot-2020.04/include/configs/sun8i.h u-boot-2020.04-mender/include/c
  #endif /* __CONFIG_H */
 diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-mender/include/configs/sunxi-common.h
 --- u-boot-2020.04/include/configs/sunxi-common.h	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/include/configs/sunxi-common.h	2020-05-30 20:14:13.528252487 +0930
++++ u-boot-2020.04-mender/include/configs/sunxi-common.h	2020-06-06 18:51:53.322459534 +0930
 @@ -134,15 +134,7 @@
  #define CONFIG_BOARD_SIZE_LIMIT		0x7e000
  #endif
@@ -210,7 +219,7 @@ diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-mender/in
  /* 64MB of malloc() pool */
 diff -uNr u-boot-2020.04/include/env_default.h u-boot-2020.04-mender/include/env_default.h
 --- u-boot-2020.04/include/env_default.h	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/include/env_default.h	2020-05-30 20:14:13.528252487 +0930
++++ u-boot-2020.04-mender/include/env_default.h	2020-06-06 18:51:53.322459534 +0930
 @@ -9,6 +9,8 @@
  
  #include <env_callback.h>
@@ -239,7 +248,7 @@ diff -uNr u-boot-2020.04/include/env_default.h u-boot-2020.04-mender/include/env
  	"ramboot="	CONFIG_RAMBOOTCOMMAND		"\0"
 diff -uNr u-boot-2020.04/include/env_mender.h u-boot-2020.04-mender/include/env_mender.h
 --- u-boot-2020.04/include/env_mender.h	1970-01-01 09:30:00.000000000 +0930
-+++ u-boot-2020.04-mender/include/env_mender.h	2020-05-30 20:14:13.528252487 +0930
++++ u-boot-2020.04-mender/include/env_mender.h	2020-06-06 18:51:53.322459534 +0930
 @@ -0,0 +1,86 @@
 +/*
 +  Copyright 2017 Northern.tech AS
@@ -329,7 +338,7 @@ diff -uNr u-boot-2020.04/include/env_mender.h u-boot-2020.04-mender/include/env_
 +#endif /* HEADER_ENV_MENDER_H */
 diff -uNr u-boot-2020.04/scripts/Makefile.autoconf u-boot-2020.04-mender/scripts/Makefile.autoconf
 --- u-boot-2020.04/scripts/Makefile.autoconf	2020-04-14 00:32:18.000000000 +0930
-+++ u-boot-2020.04-mender/scripts/Makefile.autoconf	2020-05-30 20:14:13.529252489 +0930
++++ u-boot-2020.04-mender/scripts/Makefile.autoconf	2020-06-06 18:51:53.322459534 +0930
 @@ -109,7 +109,8 @@
  	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
  	echo \#include \<asm/config.h\>;				\