configs: am62a: convert bootcmd to distro_bootcmd

We're currently using CONFIG_BOOTCOMMAND to run custom boot scripts to
jump into linux. While this works, let's begin the transition to more
distribution friendly jumps to linux by enabling distro_bootcmd.

Convert the custom bootcmd to a distro_bootcmd

Signed-off-by: Judith Mendez <jm@ti.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>

diff --git a/configs/am62ax_evm_a53_defconfig b/configs/am62ax_evm_a53_defconfig
index 0c2cf945c62bf9bf5fb68acaec87be0e2beca083..6e97fd4060e05b7c7d4164dae57b0d8e8f09439b 100644 (file)
--- a/configs/am62ax_evm_a53_defconfig
+++ b/configs/am62ax_evm_a53_defconfig
@@ -20,7 +20,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
-CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
 CONFIG_SPL_MAX_SIZE=0x58000
 CONFIG_SPL_PAD_TO=0x0
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y

diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h
index 1bd900df7a99e807a8c6c62fc5416e178de4bf38..ba67c98693b0ad988853170dd6187568ee5b4480 100644 (file)
--- a/include/configs/am62ax_evm.h
+++ b/include/configs/am62ax_evm.h
@@ -9,7 +9,6 @@
 #define __CONFIG_AM62AX_EVM_H
 
 #include <linux/sizes.h>
-#include <config_distro_bootcmd.h>
 #include <environment/ti/mmc.h>
 #include <environment/ti/k3_dfu.h>
 
@@ -55,12 +54,36 @@
                "${bootdir}/${name_fit}\0"                              \
        "partitions=" PARTS_DEFAULT
 
+#define BOOTENV_DEV_TI_MMC(devtypeu, devtypel, instance)               \
+       DEFAULT_MMC_TI_ARGS                                             \
+       EXTRA_ENV_AM62A7_BOARD_SETTINGS_MMC                             \
+       "bootcmd_ti_mmc="                                               \
+               "run findfdt; run envboot; run init_mmc;"               \
+               "run get_kern_mmc; run get_fdt_mmc;"                    \
+               "run get_overlay_mmc;"                                  \
+               "run run_kern;\0"
+
+#define BOOTENV_DEV_NAME_TI_MMC(devtyeu, devtypel, instance)           \
+       "ti_mmc "
+
+#if CONFIG_IS_ENABLED(CMD_MMC)
+       #define BOOT_TARGET_MMC(func)                                   \
+               func(TI_MMC, ti_mmc, na)
+#else
+       #define BOOT_TARGET_MMC(func)
+#endif /* CONFIG_IS_ENABLED(CMD_MMC) */
+
+#define BOOT_TARGET_DEVICES(func)                                      \
+       BOOT_TARGET_MMC(func)
+
+#include <config_distro_bootcmd.h>
+
 /* Incorporate settings into the U-Boot environment */
 #define CFG_EXTRA_ENV_SETTINGS                                 \
        DEFAULT_LINUX_BOOT_ENV                                          \
-       DEFAULT_MMC_TI_ARGS                                             \
+       DEFAULT_FIT_TI_ARGS                                             \
        EXTRA_ENV_AM62A7_BOARD_SETTINGS                                 \
-       EXTRA_ENV_AM62A7_BOARD_SETTINGS_MMC                             \
+       BOOTENV
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>