configs: k2x_evm: Reorder default boot command

We first split the CONFIG_BOOTCOMMAND into its components to improve
readability. We then make the following order changes:

 - Run findfdt first so the fdt name can be used in envboot like OMAP
 - Install the boot monitor before running the PMMC so we can make any
     needed secure changes before PMMC, do this on both HS and non-HS
 - Move set_name_pmmc to just before get_pmmc_${boot}

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Andrew F. Davis 2017-07-17 12:59:14 -05:00 committed by Tom Rini
parent 08d06310f4
commit 3f5651a724
2 changed files with 25 additions and 10 deletions

View file

@ -54,15 +54,24 @@
#ifndef CONFIG_TI_SECURE_DEVICE
#define CONFIG_BOOTCOMMAND \
"run findfdt; " \
"run envboot; " \
"run set_name_pmmc init_${boot} init_fw_rd_${boot} " \
"get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon " \
"findfdt get_fdt_${boot} get_kern_${boot} run_kern"
"run init_${boot}; " \
"run get_mon_${boot} run_mon; " \
"run set_name_pmmc get_pmmc_${boot} run_pmmc; " \
"run get_kern_${boot}; " \
"run init_fw_rd_${boot}; " \
"run get_fdt_${boot}; " \
"run run_kern"
#else
#define CONFIG_BOOTCOMMAND \
"run envboot; run run_mon_hs set_name_pmmc init_${boot} " \
"get_pmmc_${boot} run_pmmc findfdt get_fit_${boot};" \
"bootm ${fit_loadaddr}#${name_fdt} "
"run findfdt; " \
"run envboot; " \
"run run_mon_hs; " \
"run init_${boot}; " \
"run set_name_pmmc get_pmmc_${boot} run_pmmc; " \
"run get_fit_${boot}; " \
"bootm ${fit_loadaddr}#${name_fdt}"
#endif
/* SPL SPI Loader Configuration */

View file

@ -307,12 +307,18 @@
#ifndef CONFIG_BOOTCOMMAND
#ifndef CONFIG_TI_SECURE_DEVICE
#define CONFIG_BOOTCOMMAND \
"run init_${boot} get_mon_${boot} run_mon init_fw_rd_${boot} " \
"get_fdt_${boot} get_kern_${boot} run_kern"
"run init_${boot}; " \
"run get_mon_${boot} run_mon; " \
"run get_kern_${boot}; " \
"run init_fw_rd_${boot}; " \
"run get_fdt_${boot}; " \
"run run_kern"
#else
#define CONFIG_BOOTCOMMAND \
"run run_mon_hs init_${boot} init_fw_rd_${boot} " \
"get_fit_${boot}; bootm ${fit_loadaddr}#${name_fdt}"
"run run_mon_hs; " \
"run init_${boot}; " \
"run get_fit_${boot}; " \
"bootm ${fit_loadaddr}#${name_fdt}"
#endif
#endif