Merge tag 'u-boot-imx-next-20260402' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/29745

- Migrate imx95-toradex-smarc to use upstream devicetree.
- Force fsl crypto driver to select ARCH_MISC_INIT to avoid crashes when
  using CAAM.
- Support upstream Linux reset-gpios property for the i.MX PCI driver.
- Avoid duplication of DDR tables on i.MX8MP DHCOM SoM.
- Several cleanups on tqma6 platform.
- Convert i.MX8MP boards to DM_PMIC.
- Add phyCORE-i.MX91 support.
- Drop unnecessary BOARD_EARLY_INIT_F usage.

9 files changed, 259 insertions, 259 deletions

diff --git a/include/configs/phycore_imx93.h b/include/configs/phycore_imx91_93.h
index 07364dff403..02fa1d9b274 100644
--- a/include/configs/phycore_imx93.h
+++ b/include/configs/phycore_imx91_93.h
@@ -6,8 +6,8 @@
  * Copyright (C) 2024 Mathieu Othacehe <[email protected]>
  */
 
-#ifndef __PHYCORE_IMX93_H
-#define __PHYCORE_IMX93_H
+#ifndef __PHYCORE_IMX91_93_H
+#define __PHYCORE_IMX91_93_H
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
@@ -25,4 +25,4 @@
 /* Using ULP WDOG for reset */
 #define WDOG_BASE_ADDR          WDG3_BASE_ADDR
 
-#endif /* __PHYCORE_IMX93_H */
+#endif /* __PHYCORE_IMX91_93_H */
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 5e89cd6937a..00610e76869 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -7,256 +7,22 @@
  * Configuration settings for the TQ-Systems TQMa6<Q,D,DL,S> module.
  */
 
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/stringify.h>
-
-/* place code in last 4 MiB of RAM */
+#ifndef __TQMA6_CONFIG_H
+#define __TQMA6_CONFIG_H
 
 #include "mx6_common.h"
 
-#if defined(CONFIG_TQMA6S)
-#define PHYS_SDRAM_SIZE			(512u * SZ_1M)
-#elif defined(CONFIG_TQMA6DL)
-#define PHYS_SDRAM_SIZE			(SZ_1G)
-#elif defined(CONFIG_TQMA6Q)
-#define PHYS_SDRAM_SIZE			(SZ_1G)
-#endif
-
-/* SPI Flash */
-
-#define TQMA6_SPI_FLASH_SECTOR_SIZE	SZ_64K
-
-#if !defined(CONFIG_DM_PMIC)
-#define CFG_POWER_PFUZE100_I2C_ADDR	0x08
-#define TQMA6_PFUZE100_I2C_BUS		2
-#endif
-
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#if defined(CONFIG_TQMA6X_MMC_BOOT)
-
-#define TQMA6_UBOOT_OFFSET		SZ_1K
-#define TQMA6_UBOOT_SECTOR_START	0x2
-#define TQMA6_UBOOT_SECTOR_COUNT	0x7fe
-
-#define TQMA6_FDT_OFFSET		(2 * SZ_1M)
-#define TQMA6_FDT_SECTOR_START		0x1000
-#define TQMA6_FDT_SECTOR_COUNT		0x800
-
-#define TQMA6_KERNEL_SECTOR_START	0x2000
-#define TQMA6_KERNEL_SECTOR_COUNT	0x2000
-
-#define TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS                                       \
-	"uboot_start="__stringify(TQMA6_UBOOT_SECTOR_START)"\0"                \
-	"uboot_size="__stringify(TQMA6_UBOOT_SECTOR_COUNT)"\0"                 \
-	"fdt_start="__stringify(TQMA6_FDT_SECTOR_START)"\0"                    \
-	"fdt_size="__stringify(TQMA6_FDT_SECTOR_COUNT)"\0"                     \
-	"kernel_start="__stringify(TQMA6_KERNEL_SECTOR_START)"\0"              \
-	"kernel_size="__stringify(TQMA6_KERNEL_SECTOR_COUNT)"\0"               \
-	"mmcdev="__stringify(CONFIG_ENV_MMC_DEVICE_INDEX)"\0"                       \
-	"loadimage=mmc dev ${mmcdev}; "                                        \
-		"mmc read ${loadaddr} ${kernel_start} ${kernel_size};\0"       \
-	"loadfdt=mmc dev ${mmcdev}; "                                          \
-		"mmc read ${fdt_addr} ${fdt_start} ${fdt_size};\0"             \
-	"update_uboot=if tftp ${uboot}; then "                                 \
-		"if itest ${filesize} > 0; then "                              \
-			"mmc dev ${mmcdev}; mmc rescan; "                      \
-			"setexpr blkc ${filesize} + 0x1ff; "                   \
-			"setexpr blkc ${blkc} / 0x200; "                       \
-			"if itest ${blkc} <= ${uboot_size}; then "             \
-				"mmc write ${loadaddr} ${uboot_start} "        \
-					"${blkc}; "                            \
-			"fi; "                                                 \
-		"fi; fi; "                                                     \
-		"setenv filesize; setenv blkc \0"                              \
-	"update_kernel=run kernel_name; "                                      \
-		"if tftp ${kernel}; then "                                     \
-			"if itest ${filesize} > 0; then "                      \
-				"mmc dev ${mmcdev}; mmc rescan; "              \
-				"setexpr blkc ${filesize} + 0x1ff; "           \
-				"setexpr blkc ${blkc} / 0x200; "               \
-				"if itest ${blkc} <= ${kernel_size}; then "    \
-					"mmc write ${loadaddr} "               \
-						"${kernel_start} ${blkc}; "    \
-				"fi; "                                         \
-			"fi; "                                                 \
-		"fi; "                                                         \
-		"setenv filesize; setenv blkc \0"                              \
-	"update_fdt=if tftp ${fdt_file}; then "                                \
-		"if itest ${filesize} > 0; then "                              \
-			"mmc dev ${mmcdev}; mmc rescan; "                      \
-			"setexpr blkc ${filesize} + 0x1ff; "                   \
-			"setexpr blkc ${blkc} / 0x200; "                       \
-			"if itest ${blkc} <= ${fdt_size}; then "               \
-				"mmc write ${loadaddr} ${fdt_start} ${blkc}; " \
-			"fi; "                                                 \
-		"fi; fi; "                                                     \
-		"setenv filesize; setenv blkc \0"                              \
-
-#elif defined(CONFIG_TQMA6X_SPI_BOOT)
-
-#define TQMA6_UBOOT_OFFSET		0x400
-#define TQMA6_UBOOT_SECTOR_START	0x0
-/* max u-boot size: 512k */
-#define TQMA6_UBOOT_SECTOR_SIZE		TQMA6_SPI_FLASH_SECTOR_SIZE
-#define TQMA6_UBOOT_SECTOR_COUNT	0x8
-#define TQMA6_UBOOT_SIZE		(TQMA6_UBOOT_SECTOR_SIZE * \
-					 TQMA6_UBOOT_SECTOR_COUNT)
-
-#define TQMA6_FDT_OFFSET		(CONFIG_ENV_OFFSET_REDUND + \
-					 CONFIG_ENV_SECT_SIZE)
-#define TQMA6_FDT_SECT_SIZE		(TQMA6_SPI_FLASH_SECTOR_SIZE)
-
-#define TQMA6_FDT_SECTOR_START		0x0a /* 8 Sector u-boot, 2 Sector env */
-#define TQMA6_FDT_SECTOR_COUNT		0x01
-
-#define TQMA6_KERNEL_SECTOR_START	0x10
-#define TQMA6_KERNEL_SECTOR_COUNT	0x60
-
-#define TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS                                       \
-	"mmcblkdev=0\0"                                                        \
-	"uboot_offset="__stringify(TQMA6_UBOOT_OFFSET)"\0"                     \
-	"uboot_sectors="__stringify(TQMA6_UBOOT_SECTOR_COUNT)"\0"              \
-	"fdt_start="__stringify(TQMA6_FDT_SECTOR_START)"\0"                    \
-	"fdt_sectors="__stringify(TQMA6_FDT_SECTOR_COUNT)"\0"                  \
-	"kernel_start="__stringify(TQMA6_KERNEL_SECTOR_START)"\0"              \
-	"kernel_sectors="__stringify(TQMA6_KERNEL_SECTOR_COUNT)"\0"            \
-	"update_uboot=if tftp ${uboot}; then "                                 \
-		"if itest ${filesize} > 0; then "                              \
-			"setexpr blkc ${filesize} + "                          \
-				__stringify(TQMA6_UBOOT_OFFSET) "; "           \
-			"setexpr size ${uboot_sectors} * "                     \
-				__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
-			"if itest ${blkc} <= ${size}; then "                   \
-				"sf probe; "                                   \
-				"sf erase 0 ${size}; "                         \
-				"sf write ${loadaddr} ${uboot_offset} "        \
-					"${filesize}; "                        \
-			"fi; "                                                 \
-		"fi; fi; "                                                     \
-		"setenv filesize 0; setenv blkc; setenv size \0"               \
-	"update_kernel=run kernel_name; if tftp ${kernel}; then "              \
-		"if itest ${filesize} > 0; then "                              \
-			"setexpr size ${kernel_sectors} * "                    \
-				__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
-			"setexpr offset ${kernel_start} * "                    \
-				__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
-			"if itest ${filesize} <= ${size}; then "               \
-				"sf probe; "                                   \
-				"sf erase ${offset} ${size}; "                 \
-				"sf write ${loadaddr} ${offset} "              \
-					"${filesize}; "                        \
-			"fi; "                                                 \
-		"fi; fi; "                                                     \
-		"setenv filesize 0; setenv size ; setenv offset\0"             \
-	"update_fdt=if tftp ${fdt_file}; then "                                \
-		"if itest ${filesize} > 0; then "                              \
-			"setexpr size ${fdt_sectors} * "                       \
-				__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
-			"setexpr offset ${fdt_start} * "                       \
-				__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
-			"if itest ${filesize} <= ${size}; then "               \
-				"sf probe; "                                   \
-				"sf erase ${offset} ${size}; "                 \
-				"sf write ${loadaddr} ${offset} "              \
-					"${filesize}; "                        \
-			"fi; "                                                 \
-		"fi; fi; "                                                     \
-		"setenv filesize 0; setenv size ; setenv offset\0"             \
-	"loadimage=sf probe; "                                                 \
-		"setexpr size ${kernel_sectors} * "                            \
-			__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
-		"setexpr offset ${kernel_start} * "                            \
-			__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
-		"sf read ${loadaddr} ${offset} ${size}; "                      \
-		"setenv size ; setenv offset\0"                                \
-	"loadfdt=sf probe; "                                                   \
-		"setexpr size ${fdt_sectors} * "                               \
-			__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
-		"setexpr offset ${fdt_start} * "                               \
-			__stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
-		"sf read ${fdt_addr} ${offset} ${size}; "                      \
-		"setenv size ; setenv offset\0"
-#else
-
-#error "need to define boot source"
-
-#endif
-
 /* 128 MiB offset as in ARM related docu for linux suggested */
 #define TQMA6_FDT_ADDRESS		0x18000000
 
-/* set to a resonable value, changeable by user */
-#define TQMA6_CMA_SIZE                 160M
+/* 256KiB above TQMA6_FDT_ADDRESS (TQMA6_FDT_ADDRESS + SZ_256K) */
+#define TQMA6_FDT_OVERLAY_ADDR		0x18040000
 
-#define CFG_EXTRA_ENV_SETTINGS                                              \
-	"board=tqma6\0"                                                        \
-	"uimage=uImage\0"                                                      \
-	"zimage=zImage\0"                                                      \
-	"boot_type=bootz\0"                                                    \
-	"kernel_name=if test \"${boot_type}\" != bootz; then "                 \
-		"setenv kernel ${uimage}; "                                    \
-		"else setenv kernel ${zimage}; fi\0"                           \
-	"uboot=u-boot.imx\0"                                                   \
-	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0"                               \
-	"fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0"                          \
-	"console=" CONSOLE_DEV "\0"                                            \
-	"cma_size="__stringify(TQMA6_CMA_SIZE)"\0"                             \
-	"initrd_high=0xffffffff\0"                                             \
-	"rootfsmode=ro\0"                                                      \
-	"addcma=setenv bootargs ${bootargs} cma=${cma_size}\0"                 \
-	"addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0"  \
-	"addfb=setenv bootargs ${bootargs} "                                   \
-		"imx-fbdev.legacyfb_depth=32 consoleblank=0\0"                 \
-	"mmcpart=2\0"                                                          \
-	"mmcblkdev=0\0"                                                        \
-	"mmcargs=run addmmc addtty addfb addcma\0"                             \
-	"addmmc=setenv bootargs ${bootargs} "                                  \
-		"root=/dev/mmcblk${mmcblkdev}p${mmcpart} ${rootfsmode} "       \
-		"rootwait\0"                                                   \
-	"mmcboot=echo Booting from mmc ...; "                                  \
-		"setenv bootargs; "                                            \
-		"run mmcargs; "                                                \
-		"run loadimage; "                                              \
-		"if run loadfdt; then "                                        \
-			"echo boot device tree kernel ...; "                   \
-			"${boot_type} ${loadaddr} - ${fdt_addr}; "             \
-		"else "                                                        \
-			"${boot_type}; "                                       \
-		"fi;\0"                                                        \
-		"setenv bootargs \0"                                           \
-	"netdev=eth0\0"                                                        \
-	"rootpath=/srv/nfs/tqma6\0"                                            \
-	"ipmode=static\0"                                                      \
-	"netargs=run addnfs addip addtty addfb addcma\0"                       \
-	"addnfs=setenv bootargs ${bootargs} "                                  \
-		"root=/dev/nfs rw "                                            \
-		"nfsroot=${serverip}:${rootpath},v3,tcp;\0"                    \
-	"addip_static=setenv bootargs ${bootargs} "                            \
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"            \
-		"${hostname}:${netdev}:off\0"                                  \
-	"addip_dynamic=setenv bootargs ${bootargs} ip=dhcp\0"                  \
-	"addip=if test \"${ipmode}\" != static; then "                         \
-		"run addip_dynamic; else run addip_static; fi\0"               \
-	"set_getcmd=if test \"${ipmode}\" != static; then "                    \
-		"setenv getcmd dhcp; setenv autoload yes; "                    \
-		"else setenv getcmd tftp; setenv autoload no; fi\0"            \
-	"netboot=echo Booting from net ...; "                                  \
-		"run kernel_name; "                                            \
-		"run set_getcmd; "                                             \
-		"setenv bootargs; "                                            \
-		"run netargs; "                                                \
-		"if ${getcmd} ${kernel}; then "                                \
-			"if ${getcmd} ${fdt_addr} ${fdt_file}; then "          \
-				"${boot_type} ${loadaddr} - ${fdt_addr}; "     \
-			"fi; "                                                 \
-		"fi; "                                                         \
-		"echo ... failed\0"                                            \
-	"panicboot=echo No boot device !!! reset\0"                            \
-	TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS                                      \
+/* 16MiB above TQMA6_FDT_ADDRESS (TQMA6_FDT_ADDRESS + SZ_16M) */
+#define TQMA6_INITRD_ADDRESS		0x19000000
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
@@ -265,19 +31,11 @@
 #define CFG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
-/*
- * All the defines above are for the TQMa6 SoM
- *
- * Now include the baseboard specific configuration
- */
-#ifdef CONFIG_MBA6
-#include "tqma6_mba6.h"
-#elif CONFIG_WRU4
-#include "tqma6_wru4.h"
-#else
-#error "No baseboard for the TQMa6 defined!"
-#endif
+#define TQMA6_MMC_UBOOT_SECTOR_START	0x2
+#define TQMA6_MMC_UBOOT_SECTOR_COUNT	0x7fe
 
-/* Support at least the sensor on TQMa6 SOM */
+#define TQMA6_SPI_FLASH_SECTOR_SIZE	SZ_64K
+#define TQMA6_SPI_UBOOT_START		0x400
+#define TQMA6_SPI_UBOOT_SIZE		0xc0000
 
-#endif /* __CONFIG_H */
+#endif /* __TQMA6_CONFIG_H */
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index 9b9f4150951..c30aeae4f29 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -11,9 +11,8 @@
 #ifndef __CONFIG_TQMA6_MBA6_H
 #define __CONFIG_TQMA6_MBA6_H
 
-#define CFG_FEC_MXC_PHYADDR		0x03
+#include "tqma6.h"
 
 #define CFG_MXC_UART_BASE		UART2_BASE
-#define CONSOLE_DEV		"ttymxc1"
 
 #endif /* __CONFIG_TQMA6_MBA6_H */
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 110bd895a8a..b35e471bd95 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_TQMA6_WRU4_H
 #define __CONFIG_TQMA6_WRU4_H
 
+#include "tqma6.h"
+
 /* Ethernet */
 #define CFG_FEC_MXC_PHYADDR		0x01
 
diff --git a/include/env/tq/mmc.env b/include/env/tq/mmc.env
new file mode 100644
index 00000000000..abf561f8467
--- /dev/null
+++ b/include/env/tq/mmc.env
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright (c) 2024-2026 TQ-Systems GmbH <[email protected]>,
+ * D-82229 Seefeld, Germany.
+ * Author: Max Merchel
+ *
+ * shared mmc environment for TQ boards
+ */
+
+addmmc=
+	setenv bootargs "${bootargs}"
+	root=/dev/mmcblk"${mmcblkdev}"p"${mmcrootpart}" "${rootfsmode}" rootwait;
+
+get_blockcount=
+	setexpr blkc "${filesize}" + 0x1ff;
+	setexpr blkc "${blkc}" / 0x200;
+
+load_mmc=
+	mmc dev "${mmcdev}"; mmc rescan;
+	load mmc "${mmcdev}":"${mmcpart}" "${kernel_addr_r}" /boot/"${image}";
+	load mmc "${mmcdev}":"${mmcpart}" "${fdt_addr_r}" /boot/"${fdtfile}";
+	fdt address "${fdt_addr_r}";
+        fdt resize 0x100000;
+	for overlay in "${fdt_overlays}"; do
+		load mmc "${mmcdev}":"${mmcpart}" "${fdtoverlay_addr_r}"
+                        /boot/"${overlay}" && fdt apply "${fdtoverlay_addr_r}";
+	done;
+
+mmcargs=run addtty addmmc
+
+mmcboot=
+	echo "Booting from mmc ...";
+	setenv bootargs && run mmcargs &&
+	if run load_mmc; then
+		run boot_os;
+	else
+		echo "ERROR: loading from mmc";
+	fi;
+
+mmcpart=2
+
+mmc_finish_update_uboot=
+	mmc write "${loadaddr}" "${update_start_blk}" "${blkc}";
+	mmc dev "${mmcdev}" 0;
+	setenv update_part;
+	setenv update_start_blk;
+	setenv blkc;
+
+mmc_prepare_update_uboot=
+	echo "Write U-Boot to mmc "${mmcdev}" ...";
+	mmc dev "${mmcdev}"; mmc rescan;
+	run get_blockcount;
+	setenv update_start_blk "${uboot_mmc_start}";
+	setenv update_part 0;
+
+mmc_switch_part=
+	mmc partconf "${mmcdev}" update_part;
+	mmc dev "${mmcdev}" "${update_part}";
+
+mmcrootpart=2
+
+update_uboot_mmc=
+	run check_ipaddr;
+	if tftp "${uboot}"; then
+		run mmc_prepare_update_uboot;
+		if itest "${blkc}" >= "${uboot_mmc_size}"; then
+			echo "ERROR: size to large ...";
+			exit;
+		fi;
+		if itest "${mmcdev}" == "${emmc_dev}"; then
+			run mmc_switch_part;
+			if itest "${update_part}" > 0 ; then
+				if env exists emmc_bootp_start; then
+					setenv update_start_blk "${emmc_bootp_start}";
+				else
+					echo "ERROR: eMMC boot partition block unset";
+					exit;
+				fi;
+			fi;
+		fi;
+		run mmc_finish_update_uboot;
+	fi;
diff --git a/include/env/tq/nfs.env b/include/env/tq/nfs.env
new file mode 100644
index 00000000000..53fcbd0d152
--- /dev/null
+++ b/include/env/tq/nfs.env
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright (c) 2024-2026 TQ-Systems GmbH <[email protected]>,
+ * D-82229 Seefeld, Germany.
+ * Author: Max Merchel
+ *
+ * shared nfs environment for TQ boards
+ */
+
+addnfs=
+	setenv bootargs "${bootargs}" root=/dev/nfs rw
+        nfsroot="${serverip}":"${rootpath}",v3,tcp
+
+load_nfs=
+	nfs "${kernel_addr_r}" "${serverip}":"${rootpath}"/boot/"${image}";
+	nfs "${fdt_addr_r}" "${serverip}":"${rootpath}"/boot/"${fdtfile}";
+	fdt address "${fdt_addr_r}";
+	fdt resize 0x100000;
+	for overlay in "${fdt_overlays}"; do
+		nfs "${fdtoverlay_addr_r}"
+		        "${serverip}":"${rootpath}"/boot/"${overlay}" &&
+			fdt apply "${fdtoverlay_addr_r}";
+	done;
+
+load_tftp=
+	tftp "${kernel_addr_r}" "${image}";
+	tftp "${fdt_addr_r}" "${fdtfile}";
+	fdt address "${fdt_addr_r}";
+	fdt resize 0x100000;
+	for overlay in "${fdt_overlays}"; do
+		if tftp "${fdtoverlay_addr_r}" "${overlay}"; then
+			fdt apply "${fdtoverlay_addr_r}";
+		else
+			exit;
+		fi;
+	done;
+
+netargs=run addnfs addip addtty
+
+netloadcmd=load_tftp
+
+nfsboot=
+	echo "Booting from NFS ...";
+	setenv bootargs;
+	run netargs;
+	run check_ipaddr;
+	if run ${netloadcmd}; then
+		run boot_os;
+	else
+		echo "ERROR: loading from NFS";
+	fi;
diff --git a/include/env/tq/spi.env b/include/env/tq/spi.env
new file mode 100644
index 00000000000..47dcfea7d3f
--- /dev/null
+++ b/include/env/tq/spi.env
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright (c) 2024-2026 TQ-Systems GmbH <[email protected]>,
+ * D-82229 Seefeld, Germany.
+ * Author: Max Merchel
+ *
+ * shared spi environment for TQ boards
+ */
+
+update_uboot_spi=
+	run check_ipaddr;
+	if tftp ${uboot}; then
+		if itest "${filesize}" >= "${uboot_spi_size}"; then
+			echo "ERROR: size to large ...";
+			exit;
+		fi;
+		echo "Write u-boot image to SPI NOR ...";
+		if sf probe; then
+			run write_uboot_spi;
+		fi;
+	fi;
+
+write_uboot_spi=sf update "${loadaddr}" "${uboot_spi_start}" "${filesize}"
diff --git a/include/env/tq/tq-imx-shared.env b/include/env/tq/tq-imx-shared.env
new file mode 100644
index 00000000000..d4e42f8b536
--- /dev/null
+++ b/include/env/tq/tq-imx-shared.env
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright (c) 2024-2026 TQ-Systems GmbH <[email protected]>,
+ * D-82229 Seefeld, Germany.
+ * Author: Max Merchel
+ *
+ * shared environment for TQ imx boards
+ */
+
+#ifdef CONFIG_CMD_SF
+#include "spi.env"
+#ifdef CONFIG_CMD_UBIFS
+#include "ubi.env"
+#endif /* CONFIG_CMD_UBIFS */
+#endif /* CONFIG_CMD_SF */
+
+#ifdef CONFIG_CMD_MMC
+#include "mmc.env"
+#endif
+
+#ifdef CONFIG_CMD_NFS
+#include "nfs.env"
+#endif
+
+addip=
+	run check_ipaddr;
+	setenv bootargs "${bootargs}"
+	ip="${ipaddr}":"${serverip}":"${gatewayip}":"${netmask}":"${hostname}":"${netdev}":off
+
+addtty=setenv bootargs "${bootargs}" "${console}"
+
+check_ipaddr=
+	if test -z "${ipaddr}" || test -z "${serverip}"; then
+		echo "ipaddr or serverip unset, falling back to DHCP...";
+		dhcp;
+	fi;
+
+rootfsmode=ro
diff --git a/include/env/tq/ubi.env b/include/env/tq/ubi.env
new file mode 100644
index 00000000000..01243d2eb53
--- /dev/null
+++ b/include/env/tq/ubi.env
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright (c) 2024-2026 TQ-Systems GmbH <[email protected]>,
+ * D-82229 Seefeld, Germany.
+ * Author: Max Merchel
+ *
+ * shared ubi environment for TQ boards
+ */
+
+addubi=
+	setenv bootargs "${bootargs}" rootfstype=ubifs ubi.mtd="${ubimtdname}"
+        root=ubi0:"${ubirootfsvol}" "${rootfsmode}" rootwait;
+
+load_spi=
+	if sf probe; then
+                if ubi part "${ubirootfspart}"; then
+			if ubifsmount ubi0:"${ubirootfsvol}"; then
+				ubifsload "${kernel_addr_r}" /boot/"${image}";
+				ubifsload "${fdt_addr_r}" /boot/"${fdtfile}";
+                                fdt address "${fdt_addr_r}";
+				fdt resize 0x100000;
+				for overlay in "${fdt_overlays}"; do
+					ubifsload "${fdtoverlay_addr_r}"
+					/boot/"${overlay}" &&
+					fdt apply "${fdtoverlay_addr_r}";
+				done;
+				ubifsumount;
+			fi;
+			ubi detach;
+		fi;
+	fi
+
+ubiargs=run addubi addtty
+
+ubiboot=
+	echo "Booting from UBI ...";
+	setenv bootargs;
+	run ubiargs;
+	if run load_spi; then
+		run boot_os;
+	else
+		echo "ERROR: loading kernel";
+	fi;
+
+ubimtdname=mtdname
+ubirootfspart=ubi
+ubirootfsvol=root