Moved u-boot env to 0xC00000 and redundant env to 0xE00000

Makefile

@@ -90,8 +90,8 @@ export BOOTCMD_OPIPLUS2E_MENDER
 
 opiplus2e-fw_env.config-mender:
 define FW_ENV_OPIPLUS2E_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_OPIPLUS2E_MENDER
 
@@ -187,8 +187,8 @@ export BOOTCMD_OPIPCPLUS_MENDER
 
 opipcplus-fw_env.config-mender:
 define FW_ENV_OPIPCPLUS_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_OPIPCPLUS_MENDER
 
@@ -288,8 +288,8 @@ export BOOTCMD_OPI3LTS_MENDER
 
 opi3lts-fw_env.config-mender:
 define FW_ENV_OPI3LTS_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_OPI3LTS_MENDER
 
@@ -397,8 +397,8 @@ export BOOTCMD_ODROIDHC2_MENDER
 
 odroidhc2-fw_env.config-mender:
 define FW_ENV_ODROIDHC2_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_ODROIDHC2_MENDER
 
@@ -469,8 +469,8 @@ export BOOTCMD_TERASICDE10STANDARD_MENDER
 
 terasicde10standard-fw_env.config-mender:
 define FW_ENV_TERASICDE10STANDARD_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_TERASICDE10STANDARD_MENDER
 
@@ -608,8 +608,8 @@ export BOOTCMD_IWAVEG35M_MENDER
 
 iwaveg35m-fw_env.config-mender:
 define FW_ENV_IWAVEG35M_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_IWAVEG35M_MENDER
 
@@ -743,8 +743,8 @@ export BOOTCMD_NILEORINOCOMINI_MENDER
 
 nileorinocomini-fw_env.config-mender:
 define FW_ENV_NILEORINOCOMINI_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_NILEORINOCOMINI_MENDER
 
@@ -841,8 +841,8 @@ export BOOTCMD_RPI3_MENDER
 
 rpi3b-fw_env.config-mender:
 define FW_ENV_RPI3_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_RPI3_MENDER
 
@@ -965,8 +965,8 @@ export BOOTCMD_RPI4_MENDER
 
 rpi4b-fw_env.config-mender:
 define FW_ENV_RPI4_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_RPI4_MENDER
 
@@ -1084,8 +1084,8 @@ export BOOTCMD_AMLOGICS905X_MENDER
 
 amlogics905x-fw_env.config-mender:
 define FW_ENV_AMLOGICS905X_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_AMLOGICS905X_MENDER
 
@@ -1141,7 +1141,7 @@ friendlyelec-cm3588-plus-mender: friendlyelec-cm3588-plus-boot-cmd-mender friend
 	$(MAKE) -C u-boot-2021.04 oldconfig
 	BL31=rk3588_bl31_v1.56.elf ROCKCHIP_TPL=rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.24.bin $(MAKE) -C u-boot-2021.04
 	mount /dev/$(DISK)1 /uboot
-	dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
+	dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=34 count=49118
 	dd if=u-boot-2021.04/u-boot-rockchip.bin of=/dev/$(ROOT_DEVICE) conv=fsync,notrunc bs=512 seek=64
 	@echo "$$BOOTCMD_FRIENDLYELECCM3588PLUS_MENDER" > u-boot-2021.04/boot.cmd
 	u-boot-2021.04/tools/mkimage -C none -A arm -T script -d u-boot-2021.04/boot.cmd /uboot/boot.scr
@@ -1167,7 +1167,7 @@ export BOOTCMD_FRIENDLYELECCM3588PLUS_MENDER
 
 friendlyelec-cm3588-plus-fw_env.config-mender:
 define FW_ENV_FRIENDLYELECCM3588PLUS_MENDER
-/dev/$(BOOT_DEVICE) 0x400000 0x20000
-/dev/$(BOOT_DEVICE) 0x800000 0x20000
+/dev/$(BOOT_DEVICE) 0xC00000 0x20000
+/dev/$(BOOT_DEVICE) 0xE00000 0x20000
 endef
 export FW_ENV_FRIENDLYELECCM3588PLUS_MENDER

u-boot-2021.04-mender.patch

@@ -108,8 +108,8 @@ diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/i
 +
 +/* BB variables. */
 +#define MENDER_STORAGE_DEVICE_BASE "/dev/mmcblk0p"
-+#define MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_1 0x400000
-+#define MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_2 0x800000
++#define MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_1 0xC00000
++#define MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_2 0xE00000
 +#define MENDER_ROOTFS_PART_A_NAME "ubi0:rootfsa"
 +#define MENDER_ROOTFS_PART_B_NAME "ubi0:rootfsb"
 +#define MENDER_MTD_UBI_DEVICE_NAME "ubi"