configs: move CONFIG_SPL_TEXT_BASE to Kconfig

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

diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 90dd9f3..b043bf8 100644 (file)
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -11,6 +11,7 @@
 
 #include <linux/sizes.h>
 #include <config_distro_bootcmd.h>
+#include <environment/ti/mmc.h>
 
 #define CONFIG_ENV_SIZE                        (128 << 10)
 
@@ -18,16 +19,55 @@
 #define CONFIG_SYS_SDRAM_BASE1         0x880000000
 
 /* SPL Loader Configuration */
-#ifdef CONFIG_TARGET_AM654_A53_EVM
-#define CONFIG_SPL_TEXT_BASE           0x80080000
+
+#ifdef CONFIG_SYS_K3_SPL_ATF
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "tispl.bin"
 #endif
 
+#ifndef CONFIG_CPU_V7R
 #define CONFIG_SKIP_LOWLEVEL_INIT
+#endif
 
 #define CONFIG_SPL_MAX_SIZE            CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SPL_TEXT_BASE +        \
                                        CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE - 4)
 
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
+
+/* U-Boot general configuration */
+#define EXTRA_ENV_AM65X_BOARD_SETTINGS                                 \
+       "findfdt="                                                      \
+               "if test $board_name = am65x; then "                    \
+                       "setenv name_fdt k3-am654-base-board.dtb; "     \
+               "else if test $name_fdt = undefined; then "             \
+                       "echo WARNING: Could not determine device tree to use;"\
+               "fi; fi; "                                              \
+               "setenv fdtfile ${name_fdt}\0"                          \
+       "loadaddr=0x80080000\0"                                         \
+       "fdtaddr=0x82000000\0"                                          \
+       "name_kern=Image\0"                                             \
+       "console=ttyS2,115200n8\0"                                      \
+       "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000\0" \
+       "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
+
+/* U-Boot MMC-specific configuration */
+#define EXTRA_ENV_AM65X_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_kern_mmc=load mmc ${bootpart} ${loadaddr} "                \
+               "${bootdir}/${name_kern}\0"
+
+/* Incorporate settings into the U-Boot environment */
+#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       DEFAULT_MMC_TI_ARGS                                             \
+       EXTRA_ENV_AM65X_BOARD_SETTINGS                                  \
+       EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC
+
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>