env: Use include/env for text-environment includes

The 'environment' word is too long. We mostly use 'env' in U-Boot, so use
that as the name of the include directory too.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> # Intel Edison
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/board/keymile/km83xx/km83xx.env b/board/keymile/km83xx/km83xx.env
index ed2487c028d09069c629a96a9c7d6f169cd76b6e..1f13aaa88231ac7c894db2b9e19b61ee27f3eff9 100644 (file)
--- a/board/keymile/km83xx/km83xx.env
+++ b/board/keymile/km83xx/km83xx.env
@@ -13,8 +13,8 @@ netdev=eth0
 uimage=uImage
 #endif
 
-#include <environment/pg-wcom/common.env>
-#include <environment/pg-wcom/powerpc.env>
+#include <env/pg-wcom/common.env>
+#include <env/pg-wcom/powerpc.env>
 
 #if CONFIG_TARGET_KMCOGE5NE
 add_default+= eccmode=bch

diff --git a/board/keymile/kmcent2/kmcent2.env b/board/keymile/kmcent2/kmcent2.env
index 6b676a4ceb8bfd16cee691ad5f045607172cff7c..efa762e558990771f00a1e3f01b279922c5138da 100644 (file)
--- a/board/keymile/kmcent2/kmcent2.env
+++ b/board/keymile/kmcent2/kmcent2.env
@@ -1,4 +1,4 @@
-#include <environment/pg-wcom/common.env>
+#include <env/pg-wcom/common.env>
 
 EEprom_ivm=pca9547:70:9
 arch=ppc_82xx

diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env b/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env
index d960de6bfe01b52ba059cbabc068439369276c1b..1054dbf9f5421dc20083f0c740a4237e20b0755d 100644 (file)
--- a/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env
+++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env
@@ -1,3 +1,3 @@
-#include <environment/pg-wcom/ls102xa.env>
+#include <env/pg-wcom/ls102xa.env>
 
 hostname=EXPU1

diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env b/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env
index 4031f8bee9582847845784972e9559e44285a550..1232fe9da8bc7b0aa8b698d35612c73ca4c63bdb 100644 (file)
--- a/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env
+++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env
@@ -1,3 +1,3 @@
-#include <environment/pg-wcom/ls102xa.env>
+#include <env/pg-wcom/ls102xa.env>
 
 hostname=SELI8

diff --git a/board/siemens/iot2050/iot2050.env b/board/siemens/iot2050/iot2050.env
index 7fd836e628574cc2e4d0f6d34bb5d26885fb4e7a..caa9f80e3fcaabe524088a1a46b03d5c097365e7 100644 (file)
--- a/board/siemens/iot2050/iot2050.env
+++ b/board/siemens/iot2050/iot2050.env
@@ -6,7 +6,7 @@
  *   Jan Kiszka <jan.kiszka@siemens.com>
  */
 
-#include <environment/ti/ti_armv7_common.env>
+#include <env/ti/ti_armv7_common.env>
 
 usb_pgood_delay=900
 

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

diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env
index bb37d21de61b1742ebd3fe2df43a09a5293cb87d..f2dc87893a92d3cbd8216ae7ff4bd90b43601172 100644 (file)
--- a/board/ti/am62x/am62x.env
+++ b/board/ti/am62x/am62x.env
@@ -1,5 +1,5 @@
-#include <environment/ti/ti_armv7_common.env>
-#include <environment/ti/mmc.env>
+#include <env/ti/ti_armv7_common.env>
+#include <env/ti/mmc.env>
 
 default_device_tree=ti/k3-am625-sk.dtb
 findfdt=

diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env
index ecb07366fc8abd39ea0a3b1308e8917775e820de..1567907fcbdc30b95af41ead8daa4abf3683425f 100644 (file)
--- a/board/ti/am64x/am64x.env
+++ b/board/ti/am64x/am64x.env
@@ -1,6 +1,6 @@
-#include <environment/ti/ti_armv7_common.env>
-#include <environment/ti/mmc.env>
-#include <environment/ti/k3_dfu.env>
+#include <env/ti/ti_armv7_common.env>
+#include <env/ti/mmc.env>
+#include <env/ti/k3_dfu.env>
 
 findfdt=
        if test $board_name = am64x_gpevm; then

diff --git a/board/ti/am65x/am65x.env b/board/ti/am65x/am65x.env
index 036f4752835a5c21dece4fe8a61988c1ecc70012..755bff2707c8d8c9ffdcab2ecaa117c2a0d5b07b 100644 (file)
--- a/board/ti/am65x/am65x.env
+++ b/board/ti/am65x/am65x.env
@@ -1,8 +1,8 @@
-#include <environment/ti/ti_armv7_common.env>
-#include <environment/ti/mmc.env>
-#include <environment/ti/k3_dfu.env>
+#include <env/ti/ti_armv7_common.env>
+#include <env/ti/mmc.env>
+#include <env/ti/k3_dfu.env>
 #if CONFIG_CMD_REMOTEPROC
-#include <environment/ti/k3_rproc.env>
+#include <env/ti/k3_rproc.env>
 #endif
 
 findfdt=

diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env
index f7a4880bf8351211c79a8c1d695eb648bb699e5c..2f2fb05912791f3b27f981812baeca9db4bfa43a 100644 (file)
--- a/board/ti/j721e/j721e.env
+++ b/board/ti/j721e/j721e.env
@@ -1,10 +1,10 @@
-#include <environment/ti/ti_armv7_common.env>
-#include <environment/ti/mmc.env>
-#include <environment/ti/ufs.env>
-#include <environment/ti/k3_dfu.env>
+#include <env/ti/ti_armv7_common.env>
+#include <env/ti/mmc.env>
+#include <env/ti/ufs.env>
+#include <env/ti/k3_dfu.env>
 
 #if CONFIG_CMD_REMOTEPROC
-#include <environment/ti/k3_rproc.env>
+#include <env/ti/k3_rproc.env>
 #endif
 
 default_device_tree=ti/k3-j721e-common-proc-board.dtb

diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
index 2ec652dbdd3e636e3fc789e1ddf0a629eff5e012..6825b1469854c3b84773a4cd7872b7fecc73ae4a 100644 (file)
--- a/board/ti/j721s2/j721s2.env
+++ b/board/ti/j721s2/j721s2.env
@@ -1,10 +1,10 @@
-#include <environment/ti/ti_armv7_common.env>
-#include <environment/ti/mmc.env>
-#include <environment/ti/ufs.env>
-#include <environment/ti/k3_dfu.env>
+#include <env/ti/ti_armv7_common.env>
+#include <env/ti/mmc.env>
+#include <env/ti/ufs.env>
+#include <env/ti/k3_dfu.env>
 
 #if CONFIG_CMD_REMOTEPROC
-#include <environment/ti/k3_rproc.env>
+#include <env/ti/k3_rproc.env>
 #endif
 
 default_device_tree=ti/k3-j721s2-common-proc-board.dtb

diff --git a/board/ti/ks2_evm/k2e_evm.env b/board/ti/ks2_evm/k2e_evm.env
index 746e4065a2c0309b9a39a5ecbba8d7f715cec2ef..a145db53e5fa350618d7fa12fdd32fbc9431cb46 100644 (file)
--- a/board/ti/ks2_evm/k2e_evm.env
+++ b/board/ti/ks2_evm/k2e_evm.env
@@ -1,5 +1,5 @@
-#include <environment/ti/ti_armv7_common.env>
-#include <environment/ti/ti_armv7_keystone2.env>
+#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_armv7_keystone2.env>
 
 findfdt=setenv fdtfile ${name_fdt}
 boot=ubi

diff --git a/board/ti/ks2_evm/k2g_evm.env b/board/ti/ks2_evm/k2g_evm.env
index 72807ac87a6a9c566632157a9db333f7ebfedbda..4f4941dd0907d828e6685e20d875614023ab7741 100644 (file)
--- a/board/ti/ks2_evm/k2g_evm.env
+++ b/board/ti/ks2_evm/k2g_evm.env
@@ -1,6 +1,6 @@
-#include <environment/ti/ti_armv7_common.env>
-#include <environment/ti/ti_armv7_keystone2.env>
-#include <environment/ti/mmc.env>
+#include <env/ti/ti_armv7_common.env>
+#include <env/ti/ti_armv7_keystone2.env>
+#include <env/ti/mmc.env>
 
 set_name_pmmc=setenv name_pmmc ti-sci-firmware-k2g.bin
 dev_pmmc=0

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

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

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 5b4777851742ffbb0ffa1c5f276b22d49070442b..504b1f02283e6ab9b0ba0d869825b25e3e02b72d 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -76,7 +76,7 @@
 #include <config_distro_bootcmd.h>
 
 #ifndef CONFIG_SPL_BUILD
-#include <environment/ti/dfu.h>
+#include <env/ti/dfu.h>
 
 #define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index a2f73c475434467700eafd3acef04694afc41d0f..7ee7b7e4f4fb23612ffa0bc2f16118847481a204 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -64,7 +64,7 @@
 #include <config_distro_bootcmd.h>
 
 #ifndef CONFIG_SPL_BUILD
-#include <environment/ti/dfu.h>
+#include <env/ti/dfu.h>
 
 #define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \

diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index ba91f2b0545b51766aa90acf8b5e44dd44b39e6c..06edde69028d811f68544cddfec4d1e0b5473397 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -11,7 +11,7 @@
 #ifndef __CONFIG_AM57XX_EVM_H
 #define __CONFIG_AM57XX_EVM_H
 
-#include <environment/ti/dfu.h>
+#include <env/ti/dfu.h>
 #include <linux/sizes.h>
 
 #define CFG_SYS_NS16550_COM1           UART1_BASE      /* Base EVM has UART0 */

diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h
index 3997ce558a45975e27cb7d74d97b90ab95c571c3..57003f120f9affebafce98b4fa80f04754b3bc0a 100644 (file)
--- a/include/configs/am62ax_evm.h
+++ b/include/configs/am62ax_evm.h
@@ -9,8 +9,8 @@
 #define __CONFIG_AM62AX_EVM_H
 
 #include <linux/sizes.h>
-#include <environment/ti/mmc.h>
-#include <environment/ti/k3_dfu.h>
+#include <env/ti/mmc.h>
+#include <env/ti/k3_dfu.h>
 
 /* DDR Configuration */
 #define CFG_SYS_SDRAM_BASE1            0x880000000

diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h
index 6b2a6ee0d0ca2d9aa354797f9279ae17e7afb078..44180dc7687b763a43b31b75226d3b0523410493 100644 (file)
--- a/include/configs/am62x_evm.h
+++ b/include/configs/am62x_evm.h
@@ -10,7 +10,7 @@
 #define __CONFIG_AM625_EVM_H
 
 #include <config_distro_bootcmd.h>
-#include <environment/ti/mmc.h>
+#include <env/ti/mmc.h>
 
 /* DDR Configuration */
 #define CFG_SYS_SDRAM_BASE1            0x880000000

diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h
index 1e37ab47b9a364117b8570c81d3ce7cd38e419d6..062102a610d32b1fc4287f2ac22054c2fbc94b19 100644 (file)
--- a/include/configs/am64x_evm.h
+++ b/include/configs/am64x_evm.h
@@ -11,9 +11,9 @@
 
 #include <linux/sizes.h>
 #include <config_distro_bootcmd.h>
-#include <environment/ti/mmc.h>
+#include <env/ti/mmc.h>
 #include <asm/arch/am64_hardware.h>
-#include <environment/ti/k3_dfu.h>
+#include <env/ti/k3_dfu.h>
 
 /* DDR Configuration */
 #define CFG_SYS_SDRAM_BASE1            0x880000000

diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 2fa658d53961516d0bdbc62bc75b5179f1da6eca..9e90239a1c18e0a7155b57df11220a475f509f35 100644 (file)
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -10,9 +10,9 @@
 #define __CONFIG_AM654_EVM_H
 
 #include <linux/sizes.h>
-#include <environment/ti/mmc.h>
-#include <environment/ti/k3_rproc.h>
-#include <environment/ti/k3_dfu.h>
+#include <env/ti/mmc.h>
+#include <env/ti/k3_rproc.h>
+#include <env/ti/k3_dfu.h>
 
 /* DDR Configuration */
 #define CFG_SYS_SDRAM_BASE1            0x880000000

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 736af88a02474ddc8fbdf2ee0608c3dac6ec8f78..cef404218ed42b903cb686f577449384f18b2689 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -143,7 +143,7 @@
        "fdtaddr=0xc0600000\0" \
        "scriptaddr=0xc0600000\0"
 
-#include <environment/ti/mmc.h>
+#include <env/ti/mmc.h>
 
 #define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index ef1d5a112608c8fcdf7e58103defe90636a3f414..633ec1f32fa56959b382e469e40ca7cb4586da8d 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -11,7 +11,7 @@
 #ifndef __CONFIG_DRA7XX_EVM_H
 #define __CONFIG_DRA7XX_EVM_H
 
-#include <environment/ti/dfu.h>
+#include <env/ti/dfu.h>
 
 #define CFG_MAX_MEM_MAPPED             0x80000000
 

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index adb25a62970cfe3b23b5f462cafcc9868f0f8b2e..f44967787c97479e4d9158898cd75bbfc6c763a9 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -67,7 +67,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#include <environment/ti/mmc.h>
+#include <env/ti/mmc.h>
 
 #define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index af0093511a02a53e38e0a956f38328981ccfd5b5..fc2655a17b9118c0bc591e0a727cb41637612d77 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -135,7 +135,7 @@
        "fdtaddr=0xc0600000\0" \
        "scriptaddr=0xc0600000\0"
 
-#include <environment/ti/mmc.h>
+#include <env/ti/mmc.h>
 
 #define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \

diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h
index 4e6dc79f41b2c1d735b5edbc8c9d66c93cb92039..8668da6eba5ddaff466e744e7d46d31e7387b0b0 100644 (file)
--- a/include/configs/phycore_am335x_r2.h
+++ b/include/configs/phycore_am335x_r2.h
@@ -59,8 +59,8 @@
        func(NAND, nand, 0)
 
 #include <config_distro_bootcmd.h>
-#include <environment/ti/dfu.h>
-#include <environment/ti/mmc.h>
+#include <env/ti/dfu.h>
+#include <env/ti/mmc.h>
 
 #define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_MMC_TI_ARGS \

diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index f208f5e20db927ec46a070ab2984a01544c6a94b..2996b375723a47b3977cbec52f4edc1d30abb87b 100644 (file)
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -26,7 +26,7 @@
        func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>
-#include <environment/distro/sf.h>
+#include <env/distro/sf.h>
 
 #define TYPE_GUID_LOADER1      "5B193300-FC78-40CD-8002-E86C45580B47"
 #define TYPE_GUID_LOADER2      "2E54B353-1271-4842-806F-E436D6AF6985"

diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 9e312ac16d1a3dbce76d4d8a46b78a7ba27f4f96..c4f116aabf80f3fb9a87627dbb372559136b1cf2 100644 (file)
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -56,7 +56,7 @@
        func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>
-#include <environment/ti/mmc.h>
+#include <env/ti/mmc.h>
 
 #define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 74a39c40785cf75a43d903dad03c2a032fd0cecb..4e5aa74147d4a9cf7af5dce96510f64e3b6d0f2b 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -39,8 +39,8 @@
 #define DFUARGS
 #endif
 
-#include <environment/ti/mmc.h>
-#include <environment/ti/nand.h>
+#include <env/ti/mmc.h>
+#include <env/ti/nand.h>
 
 #ifndef CONSOLEDEV
 #define CONSOLEDEV "ttyS2"

diff --git a/include/environment/distro/sf.h b/include/env/distro/sf.h
similarity index 100%
rename from include/environment/distro/sf.h
rename to include/env/distro/sf.h

diff --git a/include/environment/pg-wcom/common.env b/include/env/pg-wcom/common.env
similarity index 100%
rename from include/environment/pg-wcom/common.env
rename to include/env/pg-wcom/common.env

diff --git a/include/environment/pg-wcom/ls102xa.env b/include/env/pg-wcom/ls102xa.env
similarity index 95%
rename from include/environment/pg-wcom/ls102xa.env
rename to include/env/pg-wcom/ls102xa.env
index 5b5bda95e283bf3b2b7b51ba8c44eaf81cb01883..abbec4245742b11b1c41096f2368a8647e0513f5 100644 (file)
--- a/include/environment/pg-wcom/ls102xa.env
+++ b/include/env/pg-wcom/ls102xa.env
@@ -1,6 +1,6 @@
 #define WCOM_UBI_PARTITION_APP
 
-#include <environment/pg-wcom/common.env>
+#include <env/pg-wcom/common.env>
 
 EEprom_ivm=pca9547:70:9
 boot=bootm $load_addr_r - $fdt_addr_r

diff --git a/include/environment/pg-wcom/powerpc.env b/include/env/pg-wcom/powerpc.env
similarity index 100%
rename from include/environment/pg-wcom/powerpc.env
rename to include/env/pg-wcom/powerpc.env

diff --git a/include/environment/ti/dfu.h b/include/env/ti/dfu.h
similarity index 100%
rename from include/environment/ti/dfu.h
rename to include/env/ti/dfu.h

diff --git a/include/environment/ti/k3_dfu.env b/include/env/ti/k3_dfu.env
similarity index 100%
rename from include/environment/ti/k3_dfu.env
rename to include/env/ti/k3_dfu.env

diff --git a/include/environment/ti/k3_dfu.h b/include/env/ti/k3_dfu.h
similarity index 100%
rename from include/environment/ti/k3_dfu.h
rename to include/env/ti/k3_dfu.h

diff --git a/include/environment/ti/k3_rproc.env b/include/env/ti/k3_rproc.env
similarity index 100%
rename from include/environment/ti/k3_rproc.env
rename to include/env/ti/k3_rproc.env

diff --git a/include/environment/ti/k3_rproc.h b/include/env/ti/k3_rproc.h
similarity index 100%
rename from include/environment/ti/k3_rproc.h
rename to include/env/ti/k3_rproc.h

diff --git a/include/environment/ti/mmc.env b/include/env/ti/mmc.env
similarity index 100%
rename from include/environment/ti/mmc.env
rename to include/env/ti/mmc.env

diff --git a/include/environment/ti/mmc.h b/include/env/ti/mmc.h
similarity index 100%
rename from include/environment/ti/mmc.h
rename to include/env/ti/mmc.h

diff --git a/include/environment/ti/nand.env b/include/env/ti/nand.env
similarity index 100%
rename from include/environment/ti/nand.env
rename to include/env/ti/nand.env

diff --git a/include/environment/ti/nand.h b/include/env/ti/nand.h
similarity index 100%
rename from include/environment/ti/nand.h
rename to include/env/ti/nand.h

diff --git a/include/environment/ti/ti_armv7_common.env b/include/env/ti/ti_armv7_common.env
similarity index 100%
rename from include/environment/ti/ti_armv7_common.env
rename to include/env/ti/ti_armv7_common.env

diff --git a/include/environment/ti/ti_armv7_keystone2.env b/include/env/ti/ti_armv7_keystone2.env
similarity index 100%
rename from include/environment/ti/ti_armv7_keystone2.env
rename to include/env/ti/ti_armv7_keystone2.env

diff --git a/include/environment/ti/ufs.env b/include/env/ti/ufs.env
similarity index 100%
rename from include/environment/ti/ufs.env
rename to include/env/ti/ufs.env

diff --git a/include/environment/ti/ufs.h b/include/env/ti/ufs.h
similarity index 100%
rename from include/environment/ti/ufs.h
rename to include/env/ti/ufs.h