From bf9c61acb6caed97114029d2dc1e91b148cd9b8a Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Fri, 25 Aug 2023 13:02:54 -0500
Subject: include: env: ti: ti_armv7_common.env: Rename to ti_common.env

ti_armv7_common does not make any more sense as it is used by armv7
and armv8 TI based platforms.

Reported-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
 include/env/ti/ti_armv7_common.env | 34 ----------------------------------
 include/env/ti/ti_common.env       | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 include/env/ti/ti_armv7_common.env
 create mode 100644 include/env/ti/ti_common.env

(limited to 'include')

diff --git a/include/env/ti/ti_armv7_common.env b/include/env/ti/ti_armv7_common.env
deleted file mode 100644
index e87a41a6590..00000000000
--- a/include/env/ti/ti_armv7_common.env
+++ /dev/null
@@ -1,34 +0,0 @@
-loadaddr=0x82000000
-kernel_addr_r=0x82000000
-fdtaddr=0x88000000
-dtboaddr=0x89000000
-fdt_addr_r=0x88000000
-fdtoverlay_addr_r=0x89000000
-rdaddr=0x88080000
-ramdisk_addr_r=0x88080000
-scriptaddr=0x80000000
-pxefile_addr_r=0x80100000
-bootm_size=0x10000000
-boot_fdt=try
-
-boot_fit=0
-addr_fit=0x90000000
-name_fit=fitImage
-update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit}
-get_overlaystring=
-	for overlay in $name_overlays;
-	do;
-	setenv overlaystring ${overlaystring}'#'${overlay};
-	done;
-get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile}
-run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring}
-bootcmd_ti_mmc=
-	run findfdt; run init_${boot};
-#if CONFIG_CMD_REMOTEPROC
-	run main_cpsw0_qsgmii_phyinit; run boot_rprocs;
-#endif
-	if test ${boot_fit} -eq 1;
-		then run get_fit_${boot}; run get_overlaystring; run run_fit;
-	else;
-		run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern;
-	fi;
diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env
new file mode 100644
index 00000000000..e87a41a6590
--- /dev/null
+++ b/include/env/ti/ti_common.env
@@ -0,0 +1,34 @@
+loadaddr=0x82000000
+kernel_addr_r=0x82000000
+fdtaddr=0x88000000
+dtboaddr=0x89000000
+fdt_addr_r=0x88000000
+fdtoverlay_addr_r=0x89000000
+rdaddr=0x88080000
+ramdisk_addr_r=0x88080000
+scriptaddr=0x80000000
+pxefile_addr_r=0x80100000
+bootm_size=0x10000000
+boot_fdt=try
+
+boot_fit=0
+addr_fit=0x90000000
+name_fit=fitImage
+update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit}
+get_overlaystring=
+	for overlay in $name_overlays;
+	do;
+	setenv overlaystring ${overlaystring}'#'${overlay};
+	done;
+get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile}
+run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring}
+bootcmd_ti_mmc=
+	run findfdt; run init_${boot};
+#if CONFIG_CMD_REMOTEPROC
+	run main_cpsw0_qsgmii_phyinit; run boot_rprocs;
+#endif
+	if test ${boot_fit} -eq 1;
+		then run get_fit_${boot}; run get_overlaystring; run run_fit;
+	else;
+		run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern;
+	fi;
-- 
cgit v1.2.3