toradex: Add support for newer kirkstone-based BSPs.

Signed-off-by: Drew Moseley <[email protected]>

meta-mender-toradex-nxp/recipes-bsp/u-boot-distro-boot/files/toradex-bsp-6.3.0

@@ -0,0 +1 @@
+toradex-bsp-6.2.0

meta-mender-toradex-nxp/recipes-bsp/u-boot-distro-boot/files/toradex-bsp-6.4.0

@@ -0,0 +1 @@
+toradex-bsp-6.2.0

meta-mender-toradex-nxp/recipes-bsp/u-boot-distro-boot/files/toradex-bsp-6.5.0

@@ -0,0 +1 @@
+toradex-bsp-6.2.0

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.3.0

@@ -0,0 +1 @@
+toradex-bsp-6.2.0

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/apalis-imx6/0001-Use-mender_dtb_name-for-fdtfile.patch

@@ -0,0 +1,31 @@
+From a5e0efc27533a8dc7c6150164413260cc3ca8a71 Mon Sep 17 00:00:00 2001
+From: Drew Moseley <[email protected]>
+Date: Fri, 11 Nov 2022 11:18:34 -0500
+Subject: [PATCH] apalis-imx6: Use mender_dtb_name for fdtfile.
+
+We use preboot to unconditionally set the value of fdtfile to
+mender_dtb_name.  This is more consistent with how Mender is
+expected to handle DTB names when using Yocto.
+
+Changelog: Title
+Signed-off-by: Drew Moseley <[email protected]>
+---
+ configs/apalis_imx6_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
+index eb3cb244b9..83f4bbc84f 100644
+--- a/configs/apalis_imx6_defconfig
++++ b/configs/apalis_imx6_defconfig
+@@ -33,7 +33,7 @@ CONFIG_FIT_VERBOSE=y
+ CONFIG_BOOTDELAY=1
+ CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd"
+ CONFIG_USE_PREBOOT=y
+-CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6q-apalis-${fdt_board}.dtb"
++CONFIG_PREBOOT="setenv fdtfile ${mender_dtb_name}"
+ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+ # CONFIG_DISPLAY_BOARDINFO is not set
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+-- 
+2.38.1
+

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/apalis-imx6/0001-configs-toradex-board-specific-mender-integration.patch

@@ -0,0 +1,38 @@
+From f05c53553558cb44fba308a328e264c2fc9950e3 Mon Sep 17 00:00:00 2001
+From: pagi <[email protected]>
+Date: Fri, 9 Jul 2021 08:29:09 +0200
+Subject: [PATCH] 0001-configs-toradex-board-specific-mender-integration
+
+---
+ configs/apalis_imx6_defconfig | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
+index c5dfd36d78..eb3cb244b9 100644
+--- a/configs/apalis_imx6_defconfig
++++ b/configs/apalis_imx6_defconfig
+@@ -6,8 +6,10 @@ CONFIG_SPL_GPIO=y
+ CONFIG_SPL_LIBCOMMON_SUPPORT=y
+ CONFIG_SPL_LIBGENERIC_SUPPORT=y
+ CONFIG_NR_DRAM_BANKS=1
+-CONFIG_ENV_SIZE=0x2000
+-CONFIG_ENV_OFFSET=0xFFFFDE00
++CONFIG_ENV_SIZE=0x4000
++CONFIG_ENV_OFFSET=0x800000
++CONFIG_ENV_OFFSET_REDUND=0x1000000
++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+ CONFIG_MX6Q=y
+ CONFIG_MX6_DDRCAL=y
+ CONFIG_TARGET_APALIS_IMX6=y
+@@ -69,7 +71,7 @@ CONFIG_OF_CONTROL=y
+ CONFIG_ENV_OVERWRITE=y
+ CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+-CONFIG_SYS_MMC_ENV_PART=1
++CONFIG_SYS_MMC_ENV_PART=0
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+ CONFIG_VERSION_VARIABLE=y
+ CONFIG_IP_DEFRAG=y
+-- 
+2.38.1
+

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/apalis-imx8/0001-Use-mender_dtb_name-for-fdtfile.patch

@@ -0,0 +1,31 @@
+From 08c6f70ce8729b39a2478b13abea5bfbfbda2aa4 Mon Sep 17 00:00:00 2001
+From: Drew Moseley <[email protected]>
+Date: Fri, 11 Nov 2022 11:23:30 -0500
+Subject: [PATCH] apalis-imx8: Use mender_dtb_name for fdtfile.
+
+We use preboot to unconditionally set the value of fdtfile to
+mender_dtb_name.  This is more consistent with how Mender is
+expected to handle DTB names when using Yocto.
+
+Changelog: Title
+Signed-off-by: Drew Moseley <[email protected]>
+---
+ configs/apalis-imx8_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
+index e63c6e186d3..1452e9319d6 100644
+--- a/configs/apalis-imx8_defconfig
++++ b/configs/apalis-imx8_defconfig
+@@ -103,6 +103,8 @@ CONFIG_CI_UDC=y
+ CONFIG_USB_PORT_AUTO=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
+ # CONFIG_EFI_LOADER is not set
++CONFIG_USE_PREBOOT=y
++CONFIG_PREBOOT="setenv fdtfile ${mender_dtb_name}"
+ CONFIG_LMB_MAX_REGIONS=16
+ CONFIG_CMD_BOOTCOUNT=y
+ CONFIG_BOOTCOUNT_LIMIT=y
+-- 
+2.40.1
+

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/apalis-imx8/0001-configs-toradex-board-specific-mender-integration.patch

@@ -0,0 +1,45 @@
+From 8dd2d206b4de0ed64455b1d091c74a38194695f4 Mon Sep 17 00:00:00 2001
+From: pagi <[email protected]>
+Date: Fri, 9 Jul 2021 08:29:09 +0200
+Subject: [PATCH] 0001-configs-toradex-board-specific-mender-integration
+
+---
+ configs/apalis-imx8_defconfig | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
+index d414e8d2d73..e63c6e186d3 100644
+--- a/configs/apalis-imx8_defconfig
++++ b/configs/apalis-imx8_defconfig
+@@ -6,8 +6,10 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
+ CONFIG_NR_DRAM_BANKS=3
+ CONFIG_SYS_MEMTEST_START=0x88000000
+ CONFIG_SYS_MEMTEST_END=0x89000000
+-CONFIG_ENV_SIZE=0x2000
+-CONFIG_ENV_OFFSET=0xFFFFDE00
++CONFIG_ENV_SIZE=0x4000
++CONFIG_ENV_OFFSET=0x800000
++CONFIG_ENV_OFFSET_REDUND=0x1000000
++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+ CONFIG_DM_GPIO=y
+ CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis"
+ CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
+@@ -47,7 +49,7 @@ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_ENV_OVERWRITE=y
+ CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+-CONFIG_SYS_MMC_ENV_PART=1
++CONFIG_SYS_MMC_ENV_PART=0
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+ CONFIG_VERSION_VARIABLE=y
+ CONFIG_IP_DEFRAG=y
+@@ -102,3 +104,6 @@ CONFIG_USB_PORT_AUTO=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
+ # CONFIG_EFI_LOADER is not set
+ CONFIG_LMB_MAX_REGIONS=16
++CONFIG_CMD_BOOTCOUNT=y
++CONFIG_BOOTCOUNT_LIMIT=y
++CONFIG_BOOTCOUNT_ENV=y
+-- 
+2.40.1
+

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/colibri-imx6ull/0001-configs-toradex-board-specific-mender-integration.patch

@@ -0,0 +1,80 @@
+From da6c6498214b4c630f7568067aa9910c8045b6e4 Mon Sep 17 00:00:00 2001
+From: Adrian Antonana <[email protected]>
+Date: Wed, 31 Mar 2021 10:21:42 +0200
+Subject: [PATCH] colibri imx6ull mender manual U-Boot integration
+
+---
+ configs/colibri-imx6ull_defconfig | 12 ++++++++----
+ include/configs/colibri-imx6ull.h | 14 ++++++++------
+ 2 files changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
+index 97f8d2e0fa..37c9cd0dda 100644
+--- a/configs/colibri-imx6ull_defconfig
++++ b/configs/colibri-imx6ull_defconfig
+@@ -16,9 +16,9 @@ CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_FIT=y
+ CONFIG_FIT_VERBOSE=y
+ CONFIG_BOOTDELAY=1
+-CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;"
++CONFIG_BOOTCOMMAND="run ubiboot; run mender_try_to_recover;"
+ CONFIG_USE_PREBOOT=y
+-CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
++CONFIG_PREBOOT="setenv fdtfile ${mender_dtb_name}"
+ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+ # CONFIG_DISPLAY_BOARDINFO is not set
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+@@ -48,12 +48,12 @@ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_REGULATOR=y
+ CONFIG_CMD_MTDPARTS=y
+ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+-CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:512k(mx6ull-bcb),1536k(u-boot1)ro,1536k(u-boot2)ro,512k(u-boot-env),-(ubi)"
++CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:512k(mx6ull-bcb),1536k(u-boot1)ro,1536k(u-boot2)ro,-(ubi)"
+ CONFIG_CMD_UBI=y
+ # CONFIG_ISO_PARTITION is not set
+ CONFIG_OF_CONTROL=y
+ CONFIG_ENV_OVERWRITE=y
+-CONFIG_ENV_IS_IN_NAND=y
++CONFIG_ENV_IS_IN_UBI=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+ CONFIG_VERSION_VARIABLE=y
+@@ -97,3 +97,7 @@ CONFIG_CI_UDC=y
+ CONFIG_USB_GADGET_DOWNLOAD=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_FDT_FIXUP_PARTITIONS=y
++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
++CONFIG_ENV_UBI_PART="ubi"
++CONFIG_ENV_UBI_VOLUME="u-boot-env-1"
++CONFIG_ENV_UBI_VOLUME_REDUND="u-boot-env-2"
+diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
+index 1722966de3..8914f42bcf 100644
+--- a/include/configs/colibri-imx6ull.h
++++ b/include/configs/colibri-imx6ull.h
+@@ -50,15 +50,17 @@
+ 	"scriptaddr=0x88280000\0"
+
+ #define UBI_BOOTCMD \
+-	"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
++	"ubiargs=ubi.mtd=${mender_mtd_ubi_dev_name} root=${mender_kernel_root} rw rootfstype=ubifs " \
+ 		"ubi.fm_autoconvert=1\0" \
+ 	"ubiboot=run setup; " \
+-		"setenv bootargs ${defargs} ${ubiargs} " \
++		"setenv bootargs ${defargs} ${ubiargs} ${mtdparts} " \
+ 		"${setupargs} ${vidargs} ${tdxargs}; echo Booting from NAND...; " \
+-		"ubi part ubi &&" \
+-		"ubi read ${kernel_addr_r} kernel && " \
+-		"ubi read ${fdt_addr_r} dtb && " \
+-		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
++		"run mender_setup; "                                   \
++		"ubi part ${mender_mtd_ubi_dev_name} && "              \
++		"ubifsmount ${mender_uboot_root_name} && "             \
++		"ubifsload ${kernel_addr_r} /boot/zImage && "          \
++		"ubifsload ${fdt_addr_r} /boot/${fdtfile} && "         \
++		"bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
+
+ #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_NAND)
+ /* Run Distro Boot script if ubiboot fails */
+-- 
+2.38.1
+

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/colibri-imx6ull/0002-use-read-only-rootfs.patch

@@ -0,0 +1,26 @@
+From 18f98c5e4b802280ba1bda3437b7f5d84161b435 Mon Sep 17 00:00:00 2001
+From: Drew Moseley <[email protected]>
+Date: Wed, 8 Feb 2023 18:10:24 -0500
+Subject: [PATCH] toradex: Setup proper readonly rootfs on NAND based
+ colibri-imx6ull
+
+---
+ include/configs/colibri-imx6ull.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
+index 8914f42bcf..cecf93e166 100644
+--- a/include/configs/colibri-imx6ull.h
++++ b/include/configs/colibri-imx6ull.h
+@@ -50,7 +50,7 @@
+ 	"scriptaddr=0x88280000\0"
+
+ #define UBI_BOOTCMD \
+-	"ubiargs=ubi.mtd=${mender_mtd_ubi_dev_name} root=${mender_kernel_root} rw rootfstype=ubifs " \
++	"ubiargs=ubi.mtd=${mender_mtd_ubi_dev_name} root=${mender_kernel_root} ro rootfstype=ubifs " \
+ 		"ubi.fm_autoconvert=1\0" \
+ 	"ubiboot=run setup; " \
+ 		"setenv bootargs ${defargs} ${ubiargs} ${mtdparts} " \
+-- 
+2.39.1
+

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/colibri-imx8x/0001-Use-mender_dtb_name-for-fdtfile.patch

@@ -0,0 +1,30 @@
+From 58d90af57812dc6023443d60a7901890b2d679e5 Mon Sep 17 00:00:00 2001
+From: Drew Moseley <[email protected]>
+Date: Fri, 11 Nov 2022 11:43:29 -0500
+Subject: [PATCH] colibri-imx8x: Use mender_dtb_name for fdtfile.
+
+We use preboot to unconditionally set the value of fdtfile to
+mender_dtb_name.  This is more consistent with how Mender is
+expected to handle DTB names when using Yocto.
+
+Changelog: Title
+Signed-off-by: Drew Moseley <[email protected]>
+---
+ configs/colibri-imx8x_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
+index db240f7202..0598dc98f5 100644
+--- a/configs/colibri-imx8x_defconfig
++++ b/configs/colibri-imx8x_defconfig
+@@ -72,5 +72,7 @@ CONFIG_FSL_LPUART=y
+ CONFIG_DM_THERMAL=y
+ CONFIG_IMX_SCU_THERMAL=y
+ # CONFIG_EFI_LOADER is not set
++CONFIG_USE_PREBOOT=y
++CONFIG_PREBOOT="setenv fdtfile ${mender_dtb_name}"
+ CONFIG_BOOTCOUNT_LIMIT=y
+ CONFIG_BOOTCOUNT_ENV=y
+-- 
+2.38.1
+

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/colibri-imx8x/0001-configs-toradex-board-specific-mender-integration.patch

@@ -0,0 +1,66 @@
+From 873a656f3d433a8a8d9a45f298f0e41321e57668 Mon Sep 17 00:00:00 2001
+From: Adrian Antonana <[email protected]>
+Date: Fri, 9 Sep 2022 07:54:14 +0200
+Subject: [PATCH] configs toradex board specific mender integration
+
+---
+ configs/colibri-imx8x_defconfig | 10 +++++++---
+ include/configs/colibri-imx8x.h |  4 ++--
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
+index 645ddcef53..db240f7202 100644
+--- a/configs/colibri-imx8x_defconfig
++++ b/configs/colibri-imx8x_defconfig
+@@ -6,8 +6,10 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
+ CONFIG_NR_DRAM_BANKS=3
+ CONFIG_SYS_MEMTEST_START=0x88000000
+ CONFIG_SYS_MEMTEST_END=0x89000000
+-CONFIG_ENV_SIZE=0x2000
+-CONFIG_ENV_OFFSET=0xFFFFDE00
++CONFIG_ENV_SIZE=0x4000
++CONFIG_ENV_OFFSET=0x800000
++CONFIG_ENV_OFFSET_REDUND=0x1000000
++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+ CONFIG_DM_GPIO=y
+ CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
+ CONFIG_TARGET_COLIBRI_IMX8X=y
+@@ -35,7 +37,7 @@ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_ENV_OVERWRITE=y
+ CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+-CONFIG_SYS_MMC_ENV_PART=1
++CONFIG_SYS_MMC_ENV_PART=0
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+ CONFIG_VERSION_VARIABLE=y
+ CONFIG_IP_DEFRAG=y
+@@ -70,3 +72,5 @@ CONFIG_FSL_LPUART=y
+ CONFIG_DM_THERMAL=y
+ CONFIG_IMX_SCU_THERMAL=y
+ # CONFIG_EFI_LOADER is not set
++CONFIG_BOOTCOUNT_LIMIT=y
++CONFIG_BOOTCOUNT_ENV=y
+diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
+index ee070408d4..641c592151 100644
+--- a/include/configs/colibri-imx8x.h
++++ b/include/configs/colibri-imx8x.h
+@@ -1,6 +1,6 @@
+ /* SPDX-License-Identifier: GPL-2.0+ */
+ /*
+- * Copyright 2019 Toradex
++ * Copyright 2019, 2022 Toradex
+  */
+
+ #ifndef __COLIBRI_IMX8X_H
+@@ -77,7 +77,7 @@
+ 	"initrd_addr=0x83800000\0" \
+ 	"initrd_high=0xffffffffffffffff\0" \
+ 	"mmcargs=setenv bootargs ${consoleargs} " \
+-		"root=PARTUUID=${uuid} rootwait " \
++		"rootwait " \
+ 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+ 	"mmcpart=1\0" \
+ 	"netargs=setenv bootargs ${consoleargs} " \
+-- 
+2.38.1
+

meta-mender-toradex-nxp/recipes-bsp/u-boot/files/toradex-bsp-6.4.0/verdin-imx8mm/0001-Use-mender_dtb_name-for-fdtfile.patch

@@ -0,0 +1,31 @@
+From fb2d6b55a57abebc6f149482912cc856de235998 Mon Sep 17 00:00:00 2001
+From: Drew Moseley <[email protected]>
+Date: Fri, 11 Nov 2022 11:45:58 -0500
+Subject: [PATCH] verdin-imx8mm: Use mender_dtb_name for fdtfile.
+
+We use preboot to unconditionally set the value of fdtfile to
+mender_dtb_name.  This is more consistent with how Mender is
+expected to handle DTB names when using Yocto.
+
+Changelog: Title
+Signed-off-by: Drew Moseley <[email protected]>
+---
+ configs/verdin-imx8mm_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
+index 48e547e51e..a87f2fcbc8 100644
+--- a/configs/verdin-imx8mm_defconfig
++++ b/configs/verdin-imx8mm_defconfig
+@@ -30,7 +30,7 @@ CONFIG_SPL_LOAD_FIT=y
+ CONFIG_OF_SYSTEM_SETUP=y
+ CONFIG_BOOTDELAY=1
+ CONFIG_USE_PREBOOT=y
+-CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx8mm-verdin-${variant}-${fdt_board}.dtb"
++CONFIG_PREBOOT="setenv fdtfile ${mender_dtb_name}"
+ CONFIG_LOG=y
+ # CONFIG_DISPLAY_BOARDINFO is not set
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+-- 
+2.38.1
+