env: Use include/env for text-environment includes

[platform/kernel/u-boot.git] / include / configs / am62x_evm.h

diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h
index 7bf0780..44180dc 100644 (file)
--- a/include/configs/am62x_evm.h
+++ b/include/configs/am62x_evm.h
@@ -10,38 +10,11 @@
 #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
 
-#ifdef CONFIG_CMD_MMC
-#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
-#else
-#define DISTRO_BOOT_DEV_MMC(func)
-#endif
-
-#ifdef CONFIG_CMD_PXE
-#define DISTRO_BOOT_DEV_PXE(func) func(PXE, pxe, na)
-#else
-#define DISTRO_BOOT_DEV_PXE(func)
-#endif
-
-#ifdef CONFIG_CMD_DHCP
-#define DISTRO_BOOT_DEV_DHCP(func) func(DHCP, dhcp, na)
-#else
-#define DISTRO_BOOT_DEV_DHCP(func)
-#endif
-
-#define BOOT_TARGET_DEVICES(func) \
-       DISTRO_BOOT_DEV_MMC(func) \
-       DISTRO_BOOT_DEV_PXE(func) \
-       DISTRO_BOOT_DEV_DHCP(func)
-
-/* Incorporate settings into the U-Boot environment */
-#define CFG_EXTRA_ENV_SETTINGS                                 \
-       BOOTENV
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>