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 78201ad..44180dc 100644 (file)
--- a/include/configs/am62x_evm.h
+++ b/include/configs/am62x_evm.h
@@ -10,56 +10,10 @@
 #define __CONFIG_AM625_EVM_H
 
 #include <config_distro_bootcmd.h>
-#include <environment/ti/mmc.h>
+#include <env/ti/mmc.h>
 
 /* DDR Configuration */
-#define CONFIG_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_AM625_BOARD_SETTINGS                                 \
-       "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0"      \
-       "findfdt="                                                      \
-               "setenv name_fdt ${default_device_tree};"               \
-               "setenv fdtfile ${name_fdt}\0"                          \
-       "name_kern=Image\0"                                             \
-       "console=ttyS2,115200n8\0"                                      \
-       "args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000 " \
-               "${mtdparts}\0"                                         \
-       "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
-
-/* U-Boot MMC-specific configuration */
-#define EXTRA_ENV_AM625_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}/${name_fdt}\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
-
-/* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       DEFAULT_LINUX_BOOT_ENV                                          \
-       DEFAULT_MMC_TI_ARGS                                             \
-       EXTRA_ENV_AM625_BOARD_SETTINGS                                  \
-       EXTRA_ENV_AM625_BOARD_SETTINGS_MMC
+#define CFG_SYS_SDRAM_BASE1            0x880000000
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>