Skip to contentSkip to conversation

include: configs: am64x_evm: Change to using .env

PATCH In review Nikhil M Jain 3 participants 5 messages Mar 30, 2023 – Apr 26, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 include: configs: am64x_evm: Change to using .env

Move to using .env file for setting up environment variables for am64x.

---
V2:
- Corrected commit message.

 board/ti/am64x/am64x.env    | 63 +++++++++++++++++++++++++++
 include/configs/am64x_evm.h | 85 -------------------------------------
 2 files changed, 63 insertions(+), 85 deletions(-)
 create mode 100644 board/ti/am64x/am64x.env
board/ti/am64x/am64x.env new file +63 -0
new file mode 100644
index 0000000000..c3960be38e
@@ -0,0 +1,63 @@
+#include <environment/ti/ti_armv7_common.env>
+#include <environment/ti/mmc.env>
+#include <environment/ti/k3_dfu.env>
+
+findfdt=
+	if test $board_name = am64x_gpevm; then
+		setenv name_fdt k3-am642-evm.dtb; fi;
+	if test $board_name = am64x_skevm; then
+		setenv name_fdt k3-am642-sk.dtb; fi;
+	if test $name_fdt = undefined; then
+		echo WARNING: Could not determine device tree to use; fi;
+name_kern=Image
+console=ttyS2,115200n8
+args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
+run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
+
+boot=mmc
+mmcdev=1
+bootpart=1:2
+bootdir=/boot
+rd_spec=-
+init_mmc=run args_all args_mmc
+get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_mmc=
+	fdt address ${fdtaddr};
+	fdt resize 0x100000;
+	for overlay in $name_overlays;
+	do;
+	load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
+	fdt apply ${dtboaddr};
+	done;
+get_kern_mmc=load mmc ${bootpart} ${loadaddr}
+	${bootdir}/${name_kern}
+get_fit_mmc=load mmc ${bootpart} ${addr_fit}
+	${bootdir}/${name_fit}
+partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
+
+args_usb=run finduuid;setenv bootargs console=${console}
+	${optargs}
+	root=PARTUUID=${uuid} rw
+	rootfstype=${mmcrootfstype}
+init_usb=run args_all args_usb
+get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_usb=
+	fdt address ${fdtaddr};
+	fdt resize 0x100000;
+	for overlay in $name_overlays;
+	do;
+	load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && fdt apply
+	${dtboaddr};
+	done;
+get_kern_usb=load usb ${bootpart} ${loadaddr}
+	${bootdir}/${name_kern}
+get_fit_usb=load usb ${bootpart} ${addr_fit}
+	${bootdir}/${name_fit}
+usbboot=setenv boot usb;
+	setenv bootpart 0:2;
+	usb start;
+	run findfdt;
+	run init_usb;
+	run get_kern_usb;
+	run get_fdt_usb;
+	run run_kern;
include/configs/am64x_evm.h +0 -85

91 lines not on this page · raw message

Signature · 1 line
2.34.1
#1 lore raw

Hi Nikhil

Thanks for the patch,

Quoted 162 lines · Nikhil M Jain

Move to using .env file for setting up environment variables for am64x.

---
V2:
- Corrected commit message.

 board/ti/am64x/am64x.env    | 63 +++++++++++++++++++++++++++
 include/configs/am64x_evm.h | 85 -------------------------------------
 2 files changed, 63 insertions(+), 85 deletions(-)
 create mode 100644 board/ti/am64x/am64x.env
board/ti/am64x/am64x.env new file +63 -0
new file mode 100644
index 0000000000..c3960be38e
@@ -0,0 +1,63 @@
+#include <environment/ti/ti_armv7_common.env>
+#include <environment/ti/mmc.env>
+#include <environment/ti/k3_dfu.env>
+
+findfdt=
+	if test $board_name = am64x_gpevm; then
+		setenv name_fdt k3-am642-evm.dtb; fi;
+	if test $board_name = am64x_skevm; then
+		setenv name_fdt k3-am642-sk.dtb; fi;
+	if test $name_fdt = undefined; then
+		echo WARNING: Could not determine device tree to use; fi;
+name_kern=Image
+console=ttyS2,115200n8
+args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
+run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
+
+boot=mmc
+mmcdev=1
+bootpart=1:2
+bootdir=/boot
+rd_spec=-
+init_mmc=run args_all args_mmc
+get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_mmc=
+	fdt address ${fdtaddr};
+	fdt resize 0x100000;
+	for overlay in $name_overlays;
+	do;
+	load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
+	fdt apply ${dtboaddr};
+	done;
+get_kern_mmc=load mmc ${bootpart} ${loadaddr}
+	${bootdir}/${name_kern}
+get_fit_mmc=load mmc ${bootpart} ${addr_fit}
+	${bootdir}/${name_fit}
+partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
+
+args_usb=run finduuid;setenv bootargs console=${console}
+	${optargs}
+	root=PARTUUID=${uuid} rw
+	rootfstype=${mmcrootfstype}
+init_usb=run args_all args_usb
+get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_usb=
+	fdt address ${fdtaddr};
+	fdt resize 0x100000;
+	for overlay in $name_overlays;
+	do;
+	load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && fdt apply
+	${dtboaddr};
+	done;
+get_kern_usb=load usb ${bootpart} ${loadaddr}
+	${bootdir}/${name_kern}
+get_fit_usb=load usb ${bootpart} ${addr_fit}
+	${bootdir}/${name_fit}
+usbboot=setenv boot usb;
+	setenv bootpart 0:2;
+	usb start;
+	run findfdt;
+	run init_usb;
+	run get_kern_usb;
+	run get_fdt_usb;
+	run run_kern;
include/configs/am64x_evm.h +0 -73
index 26a7f2521e..1e37ab47b9 100644
@@ -18,91 +18,6 @@
 /* DDR Configuration */
 #define CFG_SYS_SDRAM_BASE1		0x880000000
 
-#define PARTS_DEFAULT \
-	/* Linux partitions */ \
-	"name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
-
-/* U-Boot general configuration */
-#define EXTRA_ENV_AM642_BOARD_SETTINGS					\
-	"findfdt="							\
-		"if test $board_name = am64x_gpevm; then " \
-			"setenv fdtfile k3-am642-evm.dtb; fi; " \
-		"if test $board_name = am64x_skevm; then " \
-			"setenv fdtfile k3-am642-sk.dtb; fi;" \
-		"if test $fdtfile = undefined; then " \
-			"echo WARNING: Could not determine device tree to use; fi; \0" \
-	"name_kern=Image\0"						\
-	"console=ttyS2,115200n8\0"					\
-	"args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 "	\
-		"${mtdparts}\0"						\
-	"run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
-
-/* U-Boot MMC-specific configuration */
-#define EXTRA_ENV_AM642_BOARD_SETTINGS_MMC				\
-	"boot=mmc\0"							\
-	"mmcdev=1\0"							\
-	"bootpart=1:2\0"						\
-	"bootdir=/boot\0"						\
-	"rd_spec=-\0"							\
-	"init_mmc=run args_all args_mmc\0"				\
-	"get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-	"get_overlay_mmc="						\
-		"fdt address ${fdtaddr};"				\
-		"fdt resize 0x100000;"					\
-		"for overlay in $name_overlays;"			\
-		"do;"							\
-		"load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && "	\
-		"fdt apply ${dtboaddr};"				\
-		"done;\0"						\
-	"get_kern_mmc=load mmc ${bootpart} ${loadaddr} "		\
-		"${bootdir}/${name_kern}\0"				\
-	"get_fit_mmc=load mmc ${bootpart} ${addr_fit} "			\
-		"${bootdir}/${name_fit}\0"				\
-	"partitions=" PARTS_DEFAULT
-
-#define EXTRA_ENV_AM642_BOARD_SETTING_USBMSC				\
-	"args_usb=run finduuid;setenv bootargs console=${console} "	\
-		"${optargs} "						\
-		"root=PARTUUID=${uuid} rw "				\
-		"rootfstype=${mmcrootfstype}\0"				\
-	"init_usb=run args_all args_usb\0"				\
-	"get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-	"get_overlay_usb="						\
-		"fdt address ${fdtaddr};"				\
-		"fdt resize 0x100000;"					\
-		"for overlay in $name_overlays;"			\
-		"do;"							\
-		"load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && "	\
-		"fdt apply ${dtboaddr};"				\
-		"done;\0"						\
-	"get_kern_usb=load usb ${bootpart} ${loadaddr} "		\
-		"${bootdir}/${name_kern}\0"				\
-	"get_fit_usb=load usb ${bootpart} ${addr_fit} "			\
-		"${bootdir}/${name_fit}\0"				\
-	"usbboot=setenv boot usb;"					\
-		"setenv bootpart 0:2;"					\
-		"usb start;"						\
-		"run findfdt;"						\
-		"run init_usb;"						\
-		"run get_kern_usb;"					\
-		"run get_fdt_usb;"					\
-		"run run_kern\0"
-
-#define EXTRA_ENV_DFUARGS \
-	DFU_ALT_INFO_MMC \
-	DFU_ALT_INFO_EMMC \

include/configs/am64x_evm.h line 103

Quoted 10 lines
include/configs/am64x_evm.h +0 -10
-	DFU_ALT_INFO_RAM \
-	DFU_ALT_INFO_OSPI
-
-/* Incorporate settings into the U-Boot environment */
-#define CFG_EXTRA_ENV_SETTINGS					\
-	DEFAULT_LINUX_BOOT_ENV						\
-	DEFAULT_MMC_TI_ARGS						\
-	EXTRA_ENV_AM642_BOARD_SETTINGS					\
-	EXTRA_ENV_AM642_BOARD_SETTINGS_MMC				\
-	EXTRA_ENV_DFUARGS	

Don't we need dfu env args migrated to env.txt too ?

Regards
Devarsh

					\
Quoted 5 lines
include/configs/am64x_evm.h +0 -2
-	EXTRA_ENV_AM642_BOARD_SETTING_USBMSC
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>
 
#2 lore raw

Hi Devarsh

Quoted 171 lines · Devarsh Thakkar

Hi Nikhil

Thanks for the patch,

Quoted 166 lines · Nikhil M Jain

Move to using .env file for setting up environment variables for am64x.

---
V2:
- Corrected commit message.

  board/ti/am64x/am64x.env    | 63 +++++++++++++++++++++++++++
  include/configs/am64x_evm.h | 85 -------------------------------------
  2 files changed, 63 insertions(+), 85 deletions(-)

create mode 100644 board/ti/am64x/am64x.env

board/ti/am64x/am64x.env new file +63 -0
new file mode 100644
index 0000000000..c3960be38e
@@ -0,0 +1,63 @@
+#include <environment/ti/ti_armv7_common.env>
+#include <environment/ti/mmc.env>
+#include <environment/ti/k3_dfu.env>
+
+findfdt=
+	if test $board_name = am64x_gpevm; then
+		setenv name_fdt k3-am642-evm.dtb; fi;
+	if test $board_name = am64x_skevm; then
+		setenv name_fdt k3-am642-sk.dtb; fi;
+	if test $name_fdt = undefined; then
+		echo WARNING: Could not determine device tree to use; fi;
+name_kern=Image
+console=ttyS2,115200n8
+args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
+run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
+
+boot=mmc
+mmcdev=1
+bootpart=1:2
+bootdir=/boot
+rd_spec=-
+init_mmc=run args_all args_mmc
+get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_mmc=
+	fdt address ${fdtaddr};
+	fdt resize 0x100000;
+	for overlay in $name_overlays;
+	do;
+	load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
+	fdt apply ${dtboaddr};
+	done;
+get_kern_mmc=load mmc ${bootpart} ${loadaddr}
+	${bootdir}/${name_kern}
+get_fit_mmc=load mmc ${bootpart} ${addr_fit}
+	${bootdir}/${name_fit}
+partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
+
+args_usb=run finduuid;setenv bootargs console=${console}
+	${optargs}
+	root=PARTUUID=${uuid} rw
+	rootfstype=${mmcrootfstype}
+init_usb=run args_all args_usb
+get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_usb=
+	fdt address ${fdtaddr};
+	fdt resize 0x100000;
+	for overlay in $name_overlays;
+	do;
+	load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && fdt apply
+	${dtboaddr};
+	done;
+get_kern_usb=load usb ${bootpart} ${loadaddr}
+	${bootdir}/${name_kern}
+get_fit_usb=load usb ${bootpart} ${addr_fit}
+	${bootdir}/${name_fit}
+usbboot=setenv boot usb;
+	setenv bootpart 0:2;
+	usb start;
+	run findfdt;
+	run init_usb;
+	run get_kern_usb;
+	run get_fdt_usb;
+	run run_kern;
include/configs/am64x_evm.h +0 -77
index 26a7f2521e..1e37ab47b9 100644
@@ -18,91 +18,6 @@
  /* DDR Configuration */
  #define CFG_SYS_SDRAM_BASE1		0x880000000
 
-#define PARTS_DEFAULT \
-	/* Linux partitions */ \
-	"name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
-
-/* U-Boot general configuration */
-#define EXTRA_ENV_AM642_BOARD_SETTINGS					\
-	"findfdt="							\
-		"if test $board_name = am64x_gpevm; then " \
-			"setenv fdtfile k3-am642-evm.dtb; fi; " \
-		"if test $board_name = am64x_skevm; then " \
-			"setenv fdtfile k3-am642-sk.dtb; fi;" \
-		"if test $fdtfile = undefined; then " \
-			"echo WARNING: Could not determine device tree to use; fi; \0" \
-	"name_kern=Image\0"						\
-	"console=ttyS2,115200n8\0"					\
-	"args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 "	\
-		"${mtdparts}\0"						\
-	"run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
-
-/* U-Boot MMC-specific configuration */
-#define EXTRA_ENV_AM642_BOARD_SETTINGS_MMC				\
-	"boot=mmc\0"							\
-	"mmcdev=1\0"							\
-	"bootpart=1:2\0"						\
-	"bootdir=/boot\0"						\
-	"rd_spec=-\0"							\
-	"init_mmc=run args_all args_mmc\0"				\
-	"get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-	"get_overlay_mmc="						\
-		"fdt address ${fdtaddr};"				\
-		"fdt resize 0x100000;"					\
-		"for overlay in $name_overlays;"			\
-		"do;"							\
-		"load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && "	\
-		"fdt apply ${dtboaddr};"				\
-		"done;\0"						\
-	"get_kern_mmc=load mmc ${bootpart} ${loadaddr} "		\
-		"${bootdir}/${name_kern}\0"				\
-	"get_fit_mmc=load mmc ${bootpart} ${addr_fit} "			\
-		"${bootdir}/${name_fit}\0"				\
-	"partitions=" PARTS_DEFAULT
-
-#define EXTRA_ENV_AM642_BOARD_SETTING_USBMSC				\
-	"args_usb=run finduuid;setenv bootargs console=${console} "	\
-		"${optargs} "						\
-		"root=PARTUUID=${uuid} rw "				\
-		"rootfstype=${mmcrootfstype}\0"				\
-	"init_usb=run args_all args_usb\0"				\
-	"get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-	"get_overlay_usb="						\
-		"fdt address ${fdtaddr};"				\
-		"fdt resize 0x100000;"					\
-		"for overlay in $name_overlays;"			\
-		"do;"							\
-		"load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && "	\
-		"fdt apply ${dtboaddr};"				\
-		"done;\0"						\
-	"get_kern_usb=load usb ${bootpart} ${loadaddr} "		\
-		"${bootdir}/${name_kern}\0"				\
-	"get_fit_usb=load usb ${bootpart} ${addr_fit} "			\
-		"${bootdir}/${name_fit}\0"				\
-	"usbboot=setenv boot usb;"					\
-		"setenv bootpart 0:2;"					\
-		"usb start;"						\
-		"run findfdt;"						\
-		"run init_usb;"						\
-		"run get_kern_usb;"					\
-		"run get_fdt_usb;"					\
-		"run run_kern\0"
-
-#define EXTRA_ENV_DFUARGS \
-	DFU_ALT_INFO_MMC \
-	DFU_ALT_INFO_EMMC \
-	DFU_ALT_INFO_RAM \
-	DFU_ALT_INFO_OSPI
-
-/* Incorporate settings into the U-Boot environment */
Quoted 9 lines

include/configs/am64x_evm.h

Quoted 6 lines
include/configs/am64x_evm.h +0 -6
-#define CFG_EXTRA_ENV_SETTINGS					\
-	DEFAULT_LINUX_BOOT_ENV						\
-	DEFAULT_MMC_TI_ARGS						\
-	EXTRA_ENV_AM642_BOARD_SETTINGS					\
-	EXTRA_ENV_AM642_BOARD_SETTINGS_MMC				\
-	EXTRA_ENV_DFUARGS	

Don't we need dfu env args migrated to env.txt too ?

k3_dfu.env includes dfu env variables and it is included.

Quoted 8 lines

Regards
Devarsh

					\

include/configs/am64x_evm.h line 23

Quoted 5 lines
include/configs/am64x_evm.h +0 -2
-	EXTRA_ENV_AM642_BOARD_SETTING_USBMSC
-
  /* Now for the remaining common defines */
  #include <configs/ti_armv7_common.h>
 

Thanks,
Nikhil

Reviewed-by
#3 lore raw

Hi Nikhil,

Quoted 187 lines · Nikhil M Jain

Hi Devarsh

Quoted 175 lines · Devarsh Thakkar

Hi Nikhil

Thanks for the patch,

Quoted 170 lines · Nikhil M Jain

Move to using .env file for setting up environment variables for am64x.

---
V2:
- Corrected commit message.

  board/ti/am64x/am64x.env    | 63 +++++++++++++++++++++++++++ include/configs/am64x_evm.h | 85 -------------------------------------

  2 files changed, 63 insertions(+), 85 deletions(-)

  create mode 100644 board/ti/am64x/am64x.env

board/ti/am64x/am64x.env new file +63 -0
new file mode 100644
index 0000000000..c3960be38e
@@ -0,0 +1,63 @@
+#include <environment/ti/ti_armv7_common.env>
+#include <environment/ti/mmc.env>
+#include <environment/ti/k3_dfu.env>
+
+findfdt=
+    if test $board_name = am64x_gpevm; then
+        setenv name_fdt k3-am642-evm.dtb; fi;
+    if test $board_name = am64x_skevm; then
+        setenv name_fdt k3-am642-sk.dtb; fi;
+    if test $name_fdt = undefined; then
+        echo WARNING: Could not determine device tree to use; fi;
+name_kern=Image
+console=ttyS2,115200n8
+args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
+run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
+
+boot=mmc
+mmcdev=1
+bootpart=1:2
+bootdir=/boot
+rd_spec=-
+init_mmc=run args_all args_mmc
+get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_mmc=
+    fdt address ${fdtaddr};
+    fdt resize 0x100000;
+    for overlay in $name_overlays;
+    do;
+    load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
+    fdt apply ${dtboaddr};
+    done;
+get_kern_mmc=load mmc ${bootpart} ${loadaddr}
+    ${bootdir}/${name_kern}
+get_fit_mmc=load mmc ${bootpart} ${addr_fit}
+    ${bootdir}/${name_fit}
+partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
+
+args_usb=run finduuid;setenv bootargs console=${console}
+    ${optargs}
+    root=PARTUUID=${uuid} rw
+    rootfstype=${mmcrootfstype}
+init_usb=run args_all args_usb
+get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_usb=
+    fdt address ${fdtaddr};
+    fdt resize 0x100000;
+    for overlay in $name_overlays;
+    do;
+    load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && fdt apply
+    ${dtboaddr};
+    done;
+get_kern_usb=load usb ${bootpart} ${loadaddr}
+    ${bootdir}/${name_kern}
+get_fit_usb=load usb ${bootpart} ${addr_fit}
+    ${bootdir}/${name_fit}
+usbboot=setenv boot usb;
+    setenv bootpart 0:2;
+    usb start;
+    run findfdt;
+    run init_usb;
+    run get_kern_usb;
+    run get_fdt_usb;
+    run run_kern;
include/configs/am64x_evm.h +0 -55
index 26a7f2521e..1e37ab47b9 100644
@@ -18,91 +18,6 @@
   /* DDR Configuration */
   #define CFG_SYS_SDRAM_BASE1        0x880000000
-#define PARTS_DEFAULT \
-    /* Linux partitions */ \
-    "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
-
-/* U-Boot general configuration */
-#define EXTRA_ENV_AM642_BOARD_SETTINGS                    \
-    "findfdt="                            \
-        "if test $board_name = am64x_gpevm; then " \
-            "setenv fdtfile k3-am642-evm.dtb; fi; " \
-        "if test $board_name = am64x_skevm; then " \
-            "setenv fdtfile k3-am642-sk.dtb; fi;" \
-        "if test $fdtfile = undefined; then " \
-            "echo WARNING: Could not determine device tree to use; 
 fi; \0" \
-    "name_kern=Image\0"                        \
-    "console=ttyS2,115200n8\0"                    \
-    "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 "    \
-        "${mtdparts}\0"                        \
-    "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
-
-/* U-Boot MMC-specific configuration */
-#define EXTRA_ENV_AM642_BOARD_SETTINGS_MMC                \
-    "boot=mmc\0"                            \
-    "mmcdev=1\0"                            \
-    "bootpart=1:2\0"                        \
-    "bootdir=/boot\0"                        \
-    "rd_spec=-\0"                            \
-    "init_mmc=run args_all args_mmc\0"                \
-    "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} 
 ${bootdir}/${fdtfile}\0" \
-    "get_overlay_mmc="                        \
-        "fdt address ${fdtaddr};"                \
-        "fdt resize 0x100000;"                    \
-        "for overlay in $name_overlays;"            \
-        "do;"                            \
-        "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && 
 "    \
-        "fdt apply ${dtboaddr};"                \
-        "done;\0"                        \
-    "get_kern_mmc=load mmc ${bootpart} ${loadaddr} "        \
-        "${bootdir}/${name_kern}\0"                \
-    "get_fit_mmc=load mmc ${bootpart} ${addr_fit} "            \
-        "${bootdir}/${name_fit}\0"                \
-    "partitions=" PARTS_DEFAULT
-
-#define EXTRA_ENV_AM642_BOARD_SETTING_USBMSC                \
-    "args_usb=run finduuid;setenv bootargs console=${console} "    \
-        "${optargs} "                        \
-        "root=PARTUUID=${uuid} rw "                \
-        "rootfstype=${mmcrootfstype}\0"                \
-    "init_usb=run args_all args_usb\0"                \
-    "get_fdt_usb=load usb ${bootpart} ${fdtaddr} 
 ${bootdir}/${fdtfile}\0" \
-    "get_overlay_usb="                        \
-        "fdt address ${fdtaddr};"                \
-        "fdt resize 0x100000;"                    \
-        "for overlay in $name_overlays;"            \
-        "do;"                            \
-        "load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && 

"    \
-        "fdt apply ${dtboaddr};"                \
-        "done;\0"                        \
-    "get_kern_usb=load usb ${bootpart} ${loadaddr} "        \
-        "${bootdir}/${name_kern}\0"                \
-    "get_fit_usb=load usb ${bootpart} ${addr_fit} "            \
-        "${bootdir}/${name_fit}\0"                \
-    "usbboot=setenv boot usb;"                    \
-        "setenv bootpart 0:2;"                    \
-        "usb start;"                        \
-        "run findfdt;"                        \
-        "run init_usb;"                        \
-        "run get_kern_usb;"                    \
-        "run get_fdt_usb;"                    \
-        "run run_kern\0"

include/configs/am64x_evm.h +0 -8
-
-#define EXTRA_ENV_DFUARGS \
-    DFU_ALT_INFO_MMC \
-    DFU_ALT_INFO_EMMC \
-    DFU_ALT_INFO_RAM \
-    DFU_ALT_INFO_OSPI
-
-/* Incorporate settings into the U-Boot environment */
Quoted 9 lines
Quoted 6 lines

-#define CFG_EXTRA_ENV_SETTINGS                    \
-    DEFAULT_LINUX_BOOT_ENV                        \
-    DEFAULT_MMC_TI_ARGS                        \
-    EXTRA_ENV_AM642_BOARD_SETTINGS                    \
-    EXTRA_ENV_AM642_BOARD_SETTINGS_MMC                \
-    EXTRA_ENV_DFUARGS

Don't we need dfu env args migrated to env.txt too ?

Quoted 2 lines

k3_dfu.env includes dfu env variables and it is included.

Thanks for the info, that sounds good then.

Regards
Devarsh

Quoted 9 lines
Quoted 7 lines

Regards
Devarsh
                    \

Quoted 4 lines

-    EXTRA_ENV_AM642_BOARD_SETTING_USBMSC
-
  /* Now for the remaining common defines */
  #include <configs/ti_armv7_common.h>

Thanks,
Nikhil