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 <[email protected]>
Reviewed-by: Mattijs Korpershoek <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Tested-by: Mattijs Korpershoek <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>

diff --git a/board/siemens/iot2050/iot2050.env b/board/siemens/iot2050/iot2050.env
index caa9f80e3fcaabe524088a1a46b03d5c097365e7..8bbd7abe98f06deb8042ab4d386a9a1a4c21fc7d 100644 (file)
--- a/board/siemens/iot2050/iot2050.env
+++ b/board/siemens/iot2050/iot2050.env
@@ -6,7 +6,7 @@
  *   Jan Kiszka <[email protected]>
  */
 
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 
 usb_pgood_delay=900
 

diff --git a/board/ti/am62ax/am62ax.env b/board/ti/am62ax/am62ax.env
index 3f7c333fa40431896c81304b0694f6d6845e9d63..bfed7f360844dcf22e6a3348b53c1d67b62ebc7d 100644 (file)
--- a/board/ti/am62ax/am62ax.env
+++ b/board/ti/am62ax/am62ax.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/mmc.env>
 
 default_device_tree=ti/k3-am62a7-sk.dtb

diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env
index 1cf56dbd812836fba3a37447e3965630f4bb9c6e..1ef948df83d7adcaf2e2d128f69a53b5bea6a81e 100644 (file)
--- a/board/ti/am62x/am62x.env
+++ b/board/ti/am62x/am62x.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/mmc.env>
 
 default_device_tree=ti/k3-am625-sk.dtb

diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env
index 1567907fcbdc30b95af41ead8daa4abf3683425f..68e42222b7f16d76c7486df39b8b8f3f1139bd02 100644 (file)
--- a/board/ti/am64x/am64x.env
+++ b/board/ti/am64x/am64x.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/mmc.env>
 #include <env/ti/k3_dfu.env>
 

diff --git a/board/ti/am65x/am65x.env b/board/ti/am65x/am65x.env
index 755bff2707c8d8c9ffdcab2ecaa117c2a0d5b07b..286b9c300c057c430be5bdf8b12c4049263df778 100644 (file)
--- a/board/ti/am65x/am65x.env
+++ b/board/ti/am65x/am65x.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/mmc.env>
 #include <env/ti/k3_dfu.env>
 #if CONFIG_CMD_REMOTEPROC

diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env
index 2f2fb05912791f3b27f981812baeca9db4bfa43a..8cc8232fc131638c04f7658f39ac836402e7498b 100644 (file)
--- a/board/ti/j721e/j721e.env
+++ b/board/ti/j721e/j721e.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/mmc.env>
 #include <env/ti/ufs.env>
 #include <env/ti/k3_dfu.env>

diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
index 6825b1469854c3b84773a4cd7872b7fecc73ae4a..64e3d9da85f070dabcb61f1a5f97a3fd5672b789 100644 (file)
--- a/board/ti/j721s2/j721s2.env
+++ b/board/ti/j721s2/j721s2.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/mmc.env>
 #include <env/ti/ufs.env>
 #include <env/ti/k3_dfu.env>

diff --git a/board/ti/ks2_evm/k2e_evm.env b/board/ti/ks2_evm/k2e_evm.env
index a145db53e5fa350618d7fa12fdd32fbc9431cb46..3dbb7934c59a64d66e9cc2ed1f8aa6238631e7ee 100644 (file)
--- a/board/ti/ks2_evm/k2e_evm.env
+++ b/board/ti/ks2_evm/k2e_evm.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/ti_armv7_keystone2.env>
 
 findfdt=setenv fdtfile ${name_fdt}

diff --git a/board/ti/ks2_evm/k2g_evm.env b/board/ti/ks2_evm/k2g_evm.env
index 4f4941dd0907d828e6685e20d875614023ab7741..2b500fc6edf61c8251f9ee2a32ceec33799b90f2 100644 (file)
--- a/board/ti/ks2_evm/k2g_evm.env
+++ b/board/ti/ks2_evm/k2g_evm.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/ti_armv7_keystone2.env>
 #include <env/ti/mmc.env>
 

diff --git a/board/ti/ks2_evm/k2hk_evm.env b/board/ti/ks2_evm/k2hk_evm.env
index 0714a51090effb360dad8264f3b4d0f2dce6700e..9991b76f8fcce59a85ee3f515588a57cbbab3503 100644 (file)
--- a/board/ti/ks2_evm/k2hk_evm.env
+++ b/board/ti/ks2_evm/k2hk_evm.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/ti_armv7_keystone2.env>
 
 findfdt=setenv fdtfile ${name_fdt}

diff --git a/board/ti/ks2_evm/k2l_evm.env b/board/ti/ks2_evm/k2l_evm.env
index e8a803a4ed76a2f8cda6bd048b4148f7e28ad5fb..4e2debca4bde3e6df4a0f671d86fa818faa9bdf4 100644 (file)
--- a/board/ti/ks2_evm/k2l_evm.env
+++ b/board/ti/ks2_evm/k2l_evm.env
@@ -1,4 +1,4 @@
-#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_common.env>
 #include <env/ti/ti_armv7_keystone2.env>
 
 findfdt=setenv fdtfile ${name_fdt}

diff --git a/include/env/ti/ti_armv7_common.env b/include/env/ti/ti_armv7_common.env
deleted file mode 100644 (file)
index e87a41a..0000000
--- 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 (file)
index 0000000..e87a41a
--- /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;