u-boot: Fix various boot issues

- remove reworked kconfig patch - was doubling the
  environment size, causing the board to fail booting
- increase fdt address - the kernel was being relocated
  to 0x40600000 ending at 0x43ae0000, overwriting the fdt
  at 0x43000000.

Signed-off-by: Alexandru Costache <[email protected]>

layers/meta-balena-imx8mm/recipes-bsp/u-boot/patches/1133-iot-gate-imx8-Increase-fdt-address.patch

@@ -0,0 +1,44 @@
+From 83ef5501723628121de4ea04e312847e4803ad9a Mon Sep 17 00:00:00 2001
+From: Alexandru Costache <[email protected]>
+Date: Wed, 31 May 2023 16:17:05 +0200
+Subject: [PATCH] iot-gate-imx8: Increase fdt address
+
+To fix booting with the newer kernel
+which has increased in size
+
+Upstream-status: Inappropriate [configuration]
+Signed-off-by: Alexandru Costache <[email protected]>
+---
+ include/configs/cpl-imx8m-mini.h | 2 +-
+ include/configs/iot-gate-imx8.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/cpl-imx8m-mini.h b/include/configs/cpl-imx8m-mini.h
+index 0215f04210..16eea2b7b1 100644
+--- a/include/configs/cpl-imx8m-mini.h
++++ b/include/configs/cpl-imx8m-mini.h
+@@ -92,7 +92,7 @@
+ 		"g_mass_storage.iSerialNumber=\"\" "\
+ 		"clk_ignore_unused "\
+ 		"\0" \
+-	"initrd_addr=0x43800000\0" \
++	"initrd_addr=0x44B60000\0" \
+ 	"initrd_high=0xffffffff\0" \
+ 	"emmc_dev=2\0" \
+ 	"sd_dev=1\0" \
+diff --git a/include/configs/iot-gate-imx8.h b/include/configs/iot-gate-imx8.h
+index 1fab1658c6..c847be3387 100644
+--- a/include/configs/iot-gate-imx8.h
++++ b/include/configs/iot-gate-imx8.h
+@@ -26,7 +26,7 @@
+ 	"script=boot.scr\0" \
+ 	"image=Image.gz\0" \
+ 	"zip_addr=0x70480000\0" \
+-	"fdt_addr=0x43000000\0"	\
++	"fdt_addr=0x44360000\0"	\
+ 	"fdt_high=0xffffffffffffffff\0"	\
+ 	"initrd_high=0xffffffffffffffff\0" \
+ 	"root_opt=rootwait rw\0" \
+-- 
+2.37.2
+

layers/meta-balena-imx8mm/recipes-bsp/u-boot/u-boot-compulab_2021.04.bbappend

@@ -7,10 +7,6 @@ DEPENDS = "bison-native"
 
 PV_append ="+git${SRCPV}"
 
-SRC_URI_remove = " \
-	file://resin-specific-env-integration-kconfig.patch \
-"
-
 do_compile_prepend() {
     if [ ${BUILD_REPRODUCIBLE_BINARIES} -eq 1 ];then
         export SOURCE_DATE_EPOCH=$(date +%s)
@@ -55,8 +51,8 @@ SRC_URI_append = " \
 	file://1127-Revert-remove-include-config_defaults.h.patch \
 	file://1128-Integrate-with-Balena-u-boot-environment.patch \
 	file://1129-iot-gate-imx8-Load-kernel-and-fdt-from-root-partitio.patch \
-	file://1130-rework-resin-specific-env-integration-kconfig.patch \
 	file://1132-u-boot-compulab-Don-t-run-script-if-booting-with-Bal.patch \
+	file://1133-iot-gate-imx8-Increase-fdt-address.patch \
 "
 
 do_configure[nostamp] = "1"