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 --- include/configs/k2g_evm.h | 21 +++++++++++++++------ include/configs/ti_armv7_keystone2.h | 14 ++++++++++---- 2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 3c999df350..e9d3334f9f 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -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 */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index e7dc522da2..e9c51636b0 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -310,12 +310,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