Fixed mender build for iWave G35M

Makefile

@@ -354,10 +354,12 @@ odroidhc2-mender: odroidhc2-boot-cmd-mender odroidhc2-fw_env.config-mender
 	@echo "# CONFIG_ENV_OFFSET_REDUND is not set" >> u-boot-2021.04/.config
 	@echo "CONFIG_WDT=y" >> u-boot-2021.04/.config
 	@echo "# CONFIG_CMD_WDT is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_AST2600 is not set" >> u-boot-2021.04/.config
 	@echo "# CONFIG_WDT_AT91 is not set" >> u-boot-2021.04/.config
 	@echo "# CONFIG_WDT_CDNS is not set" >> u-boot-2021.04/.config
 	@echo "# CONFIG_WDT_CORTINA is not set" >> u-boot-2021.04/.config
 	@echo "CONFIG_WDT_EXYNOS=y" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_SBSA is not set" >> u-boot-2021.04/.config
 	@echo "# CONFIG_WDT_SP805 is not set" >> u-boot-2021.04/.config
 	@echo "# CONFIG_WDT_STM32MP is not set" >> u-boot-2021.04/.config
 	@echo "# CONFIG_XILINX_TB_WATCHDOG is not set" >> u-boot-2021.04/.config
@@ -551,9 +553,20 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave
 	@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2021.04/.config
 	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2021.04/.config
 	@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2021.04/.config
-	@echo "CONFIG_WATCHDOG=y" >> u-boot-2021.04/.config
-	@echo "CONFIG_WDT_CDNS=y" >> u-boot-2021.04/.config
+	@echo "# CONFIG_ENV_OFFSET is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_ENV_OFFSET_REDUND is not set" >> u-boot-2021.04/.config
 	@echo "CONFIG_WDT=y" >> u-boot-2021.04/.config
+	@echo "# CONFIG_CMD_WDT is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_ASPEED is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_AST2600 is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_AT91 is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_CDNS is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_CORTINA is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_ORION is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_SBSA is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_SP805 is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_WDT_STM32MP is not set" >> u-boot-2021.04/.config
+	@echo "# CONFIG_XILINX_TB_WATCHDOG is not set" >> u-boot-2021.04/.config
 	$(MAKE) -C u-boot-2021.04 oldconfig
 	$(MAKE) -C u-boot-2021.04
 	mount /dev/$(DISK)1 /uboot

u-boot-2021.04-iwaveg35m.patch

@@ -2714,7 +2714,7 @@ diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35
 +CONFIG_NR_DRAM_BANKS=4
 +CONFIG_SYS_MEMTEST_START=0
 +CONFIG_SYS_MEMTEST_END=0x1000
-+CONFIG_ENV_SIZE=0x8000
++CONFIG_ENV_SIZE=0x20000
 +CONFIG_DM_GPIO=y
 +CONFIG_XILINX_GPIO=y
 +CONFIG_DEFAULT_DEVICE_TREE="system-top"

u-boot-2021.04-mender.patch

 diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/configs/odroid-xu3_defconfig
 --- u-boot-2021.04/configs/odroid-xu3_defconfig	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/configs/odroid-xu3_defconfig	2024-05-30 15:48:59.983798479 +0000
++++ u-boot-2021.04-mender/configs/odroid-xu3_defconfig	2025-02-20 23:10:05.119580783 +0000
 @@ -4,8 +4,7 @@
  CONFIG_SYS_TEXT_BASE=0x43E00000
  CONFIG_ARCH_EXYNOS5=y
@@ -13,7 +13,7 @@ diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/conf
  CONFIG_DISTRO_DEFAULTS=y
 diff -uNr u-boot-2021.04/configs/p212_defconfig u-boot-2021.04-mender/configs/p212_defconfig
 --- u-boot-2021.04/configs/p212_defconfig	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/configs/p212_defconfig	2024-05-30 15:48:59.983798479 +0000
++++ u-boot-2021.04-mender/configs/p212_defconfig	2025-02-20 23:10:05.123580760 +0000
 @@ -2,7 +2,7 @@
  CONFIG_ARCH_MESON=y
  CONFIG_SYS_TEXT_BASE=0x01000000
@@ -25,7 +25,7 @@ diff -uNr u-boot-2021.04/configs/p212_defconfig u-boot-2021.04-mender/configs/p2
  CONFIG_DEBUG_UART_BASE=0xc81004c0
 diff -uNr u-boot-2021.04/configs/rpi_3_defconfig u-boot-2021.04-mender/configs/rpi_3_defconfig
 --- u-boot-2021.04/configs/rpi_3_defconfig	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/configs/rpi_3_defconfig	2024-05-30 15:48:59.983798479 +0000
++++ u-boot-2021.04-mender/configs/rpi_3_defconfig	2025-02-20 23:10:05.123580760 +0000
 @@ -5,7 +5,7 @@
  CONFIG_TARGET_RPI_3=y
  CONFIG_SYS_MALLOC_F_LEN=0x2000
@@ -37,7 +37,7 @@ diff -uNr u-boot-2021.04/configs/rpi_3_defconfig u-boot-2021.04-mender/configs/r
  CONFIG_OF_BOARD_SETUP=y
 diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
 --- u-boot-2021.04/env/Kconfig	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/env/Kconfig	2024-05-30 15:48:59.987798557 +0000
++++ u-boot-2021.04-mender/env/Kconfig	2025-02-20 23:10:05.127580737 +0000
 @@ -514,26 +514,14 @@
  	  environment location.
  
@@ -56,7 +56,7 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
 -	default 0x260000 if ARCH_OMAP2PLUS
 -	default 0x1080000 if MICROBLAZE && ENV_IS_IN_SPI_FLASH
 +	hex "Environment Offset will be set by mender patch"
-+	depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X && !ARCH_EXYNOS
++	depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X && !ARCH_SOCFPGA && !ARCH_EXYNOS && !ARCH_ZYNQMP
  	help
  	  Offset from the start of the device (or partition)
  
@@ -65,7 +65,7 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
 -	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 && !ARCH_SOCFPGA && !ARCH_EXYNOS
++	depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X && !ARCH_SOCFPGA && !ARCH_EXYNOS && !ARCH_ZYNQMP
  	help
  	  Offset from the start of the device (or partition) of the redundant
  	  environment location.
@@ -97,7 +97,7 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
  	help
 diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/include/config_mender_defines.h
 --- u-boot-2021.04/include/config_mender_defines.h	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2021.04-mender/include/config_mender_defines.h	2024-05-30 15:48:59.987798557 +0000
++++ u-boot-2021.04-mender/include/config_mender_defines.h	2025-02-20 23:10:05.131580713 +0000
 @@ -0,0 +1,17 @@
 +/* Shell variables */
 +#define MENDER_BOOT_PART_NUMBER 1
@@ -118,7 +118,7 @@ diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/i
 +#define MENDER_BOOTENV_SIZE 0x20000
 diff -uNr u-boot-2021.04/include/config_mender.h u-boot-2021.04-mender/include/config_mender.h
 --- u-boot-2021.04/include/config_mender.h	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2021.04-mender/include/config_mender.h	2024-05-30 15:48:59.987798557 +0000
++++ u-boot-2021.04-mender/include/config_mender.h	2025-02-20 23:10:05.131580713 +0000
 @@ -0,0 +1,83 @@
 +/*
 +  Copyright 2017 Northern.tech AS
@@ -205,7 +205,7 @@ diff -uNr u-boot-2021.04/include/config_mender.h u-boot-2021.04-mender/include/c
 +#endif /* HEADER_CONFIG_MENDER_H */
 diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include/configs/meson64.h
 --- u-boot-2021.04/include/configs/meson64.h	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/include/configs/meson64.h	2024-05-30 15:48:59.991798635 +0000
++++ u-boot-2021.04-mender/include/configs/meson64.h	2025-02-20 23:10:05.135580690 +0000
 @@ -31,6 +31,8 @@
  
  #define CONFIG_CPU_ARMV8
@@ -217,7 +217,7 @@ diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include
  #define CONFIG_SYS_CBSIZE		1024
 diff -uNr u-boot-2021.04/include/configs/odroid_xu3.h u-boot-2021.04-mender/include/configs/odroid_xu3.h
 --- u-boot-2021.04/include/configs/odroid_xu3.h	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/include/configs/odroid_xu3.h	2024-05-30 15:48:59.991798635 +0000
++++ u-boot-2021.04-mender/include/configs/odroid_xu3.h	2025-02-20 23:10:05.135580690 +0000
 @@ -10,6 +10,9 @@
  #include <configs/exynos5420-common.h>
  #include <configs/exynos5-common.h>
@@ -230,7 +230,7 @@ diff -uNr u-boot-2021.04/include/configs/odroid_xu3.h u-boot-2021.04-mender/incl
  #define CONFIG_SYS_SDRAM_BASE		0x40000000
 diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/configs/rpi.h
 --- u-boot-2021.04/include/configs/rpi.h	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/include/configs/rpi.h	2024-05-30 15:48:59.991798635 +0000
++++ u-boot-2021.04-mender/include/configs/rpi.h	2025-02-20 23:10:05.139580667 +0000
 @@ -95,6 +95,8 @@
  #define CONFIG_SYS_CBSIZE		1024
  
@@ -242,7 +242,7 @@ diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/con
  /* Shell */
 diff -uNr u-boot-2021.04/include/configs/sun50i.h u-boot-2021.04-mender/include/configs/sun50i.h
 --- u-boot-2021.04/include/configs/sun50i.h	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/include/configs/sun50i.h	2024-05-30 15:46:47.521222390 +0000
++++ u-boot-2021.04-mender/include/configs/sun50i.h	2025-02-20 23:10:05.139580667 +0000
 @@ -23,4 +23,7 @@
   */
  #include <configs/sunxi-common.h>
@@ -253,7 +253,7 @@ diff -uNr u-boot-2021.04/include/configs/sun50i.h u-boot-2021.04-mender/include/
  #endif /* __CONFIG_H */
 diff -uNr u-boot-2021.04/include/configs/sun8i.h u-boot-2021.04-mender/include/configs/sun8i.h
 --- u-boot-2021.04/include/configs/sun8i.h	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/include/configs/sun8i.h	2024-05-30 15:48:59.995798712 +0000
++++ u-boot-2021.04-mender/include/configs/sun8i.h	2025-02-20 23:10:05.143580644 +0000
 @@ -17,4 +17,7 @@
   */
  #include <configs/sunxi-common.h>
@@ -262,9 +262,20 @@ diff -uNr u-boot-2021.04/include/configs/sun8i.h u-boot-2021.04-mender/include/c
 +#define CONFIG_BOOTCOUNT_ENV
 +
  #endif /* __CONFIG_H */
+diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-mender/include/configs/xilinx_zynqmp.h
+--- u-boot-2021.04/include/configs/xilinx_zynqmp.h	2021-04-05 15:03:29.000000000 +0000
++++ u-boot-2021.04-mender/include/configs/xilinx_zynqmp.h	2025-02-20 23:11:20.107140623 +0000
+@@ -255,4 +255,7 @@
+ # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used"
+ #endif
+ 
++#define CONFIG_BOOTCOUNT_LIMIT
++#define CONFIG_BOOTCOUNT_ENV
++
+ #endif /* __XILINX_ZYNQMP_H */
 diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env_default.h
 --- u-boot-2021.04/include/env_default.h	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/include/env_default.h	2024-05-30 15:48:59.995798712 +0000
++++ u-boot-2021.04-mender/include/env_default.h	2025-02-20 23:10:05.143580644 +0000
 @@ -10,6 +10,8 @@
  #include <env_callback.h>
  #include <linux/stringify.h>
@@ -293,7 +304,7 @@ diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env
  	"ramboot="	CONFIG_RAMBOOTCOMMAND		"\0"
 diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_mender.h
 --- u-boot-2021.04/include/env_mender.h	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2021.04-mender/include/env_mender.h	2024-05-30 15:49:00.003798868 +0000
++++ u-boot-2021.04-mender/include/env_mender.h	2025-02-20 23:10:05.147580620 +0000
 @@ -0,0 +1,86 @@
 +/*
 +  Copyright 2017 Northern.tech AS
@@ -383,7 +394,7 @@ diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_
 +#endif /* HEADER_ENV_MENDER_H */
 diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-mender/scripts/config_whitelist.txt
 --- u-boot-2021.04/scripts/config_whitelist.txt	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/scripts/config_whitelist.txt	2024-05-30 15:49:00.003798868 +0000
++++ u-boot-2021.04-mender/scripts/config_whitelist.txt	2025-02-20 23:10:05.151580597 +0000
 @@ -2911,6 +2911,8 @@
  CONFIG_SYS_MMC_BASE
  CONFIG_SYS_MMC_CD_PIN
@@ -395,7 +406,7 @@ diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-mender/scri
  CONFIG_SYS_MMC_U_BOOT_DST
 diff -uNr u-boot-2021.04/scripts/Makefile.autoconf u-boot-2021.04-mender/scripts/Makefile.autoconf
 --- u-boot-2021.04/scripts/Makefile.autoconf	2021-04-05 15:03:29.000000000 +0000
-+++ u-boot-2021.04-mender/scripts/Makefile.autoconf	2024-05-30 15:49:00.007798946 +0000
++++ u-boot-2021.04-mender/scripts/Makefile.autoconf	2025-02-20 23:10:05.155580574 +0000
 @@ -108,7 +108,8 @@
  	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
  	echo \#include \<asm/config.h\>;				\