diff options
| author | Andrew F. Davis <afd@ti.com> | 2017-07-17 12:59:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-26 11:26:50 -0400 |
| commit | 3f5651a72480c5fec3f846b604bfb3aeb532213c (patch) | |
| tree | d1165c9ce0a24c919b07c59a6c01adf9df9e79cb | |
| parent | 08d06310f4d8f99208f95936bf7de83de9d8af04 (diff) | |
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>
| -rw-r--r-- | include/configs/k2g_evm.h | 21 | ||||
| -rw-r--r-- | 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 132dc89ccc..1117e5e5dd 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 0aad63fe03..c6122a0f74 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -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 |