From 7ed1ccaf301097934a097299c9886adc070df543 Mon Sep 17 00:00:00 2001
From: Vaishnav Achath <vaishnav.a@ti.com>
Date: Thu, 1 Jun 2023 12:38:27 +0530
Subject: [PATCH] environment: ti: Fix the dfu environment variables for eMMC
 and OSPI

As the size of tiboot3.bin has increased, the memory layout of the
bootloaders in eMMC and OSPI have been changed to accommodate this.

Therefore, introduce new dfu environment variables for combined boot images
and accordingly update them for J7200 by creating a new environment file.

Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
---
 board/ti/j721e/j721e.env                   |  5 ++++
 include/environment/ti/k3_dfu_combined.env | 28 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 include/environment/ti/k3_dfu_combined.env

diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env
index 6e3a6143d0..0984331f77 100644
--- a/board/ti/j721e/j721e.env
+++ b/board/ti/j721e/j721e.env
@@ -1,7 +1,12 @@
 #include <environment/ti/ti_armv7_common.env>
 #include <environment/ti/mmc.env>
 #include <environment/ti/ufs.env>
+#if defined(CONFIG_TARGET_J721E_A72_EVM) || \
+defined(CONFIG_TARGET_J721E_R5_EVM)
 #include <environment/ti/k3_dfu.env>
+#else
+#include <environment/ti/k3_dfu_combined.env>
+#endif
 
 #if CONFIG_CMD_REMOTEPROC
 #include <environment/ti/k3_rproc.env>
diff --git a/include/environment/ti/k3_dfu_combined.env b/include/environment/ti/k3_dfu_combined.env
new file mode 100644
index 0000000000..4bc339a400
--- /dev/null
+++ b/include/environment/ti/k3_dfu_combined.env
@@ -0,0 +1,28 @@
+dfu_alt_info_mmc=
+	boot part 1 1;
+	rootfs part 1 2;
+	tiboot3.bin fat 1 1;
+	tispl.bin fat 1 1;
+	u-boot.img fat 1 1;
+	uEnv.txt fat 1 1;
+	sysfw.itb fat 1 1
+
+dfu_alt_info_emmc=
+	rawemmc raw 0 0x800000 mmcpart 1;
+	rootfs part 0 1 mmcpart 0;
+	tiboot3.bin.raw raw 0x0 0x800 mmcpart 1;
+	tispl.bin.raw raw 0x800 0x1000 mmcpart 1;
+	u-boot.img.raw raw 0x1800 0x2000 mmcpart 1;
+	u-env.raw raw 0x3400 0x100 mmcpart 1;
+
+dfu_alt_info_ospi=
+	tiboot3.bin raw 0x0 0x100000;
+	tispl.bin raw 0x100000 0x200000;
+	u-boot.img raw 0x300000 0x400000;
+	u-boot-env raw 0x700000 0x020000;
+	rootfs raw 0x800000 0x3800000
+
+dfu_alt_info_ram=
+	tispl.bin ram 0x80080000 0x200000;
+	u-boot.img ram 0x81000000 0x400000
+