diff options
| author | Tom Rini <[email protected]> | 2023-05-04 20:57:59 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-04 20:57:59 -0400 |
| commit | 0160d58218a703150d3a76b1c17e3a70658db11f (patch) | |
| tree | d99ce0f2d7ac1320418aff5a7aaa5c2ef59b005c /include | |
| parent | 7f30eec1779b8f641b9563a1dab6a6865916ec01 (diff) | |
| parent | 1e666512fb00d3aed6e32db2c22579e87d977d76 (diff) | |
Merge branch '2023-05-04-assorted-TI-updates'
- Clean up / merge some defconfigs, update DDR timings and a few more
assorted fixes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ti_armv7_common.h | 3 | ||||
| -rw-r--r-- | include/environment/ti/ti_armv7_common.env | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index d54c208ef66..149a74d98e8 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -55,7 +55,8 @@ "do;" \ "setenv overlaystring ${overlaystring}'#'${overlay};" \ "done;\0" \ - "run_fit=bootm ${addr_fit}#conf-${fdtfile}${overlaystring}\0" \ + "get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile}\0" \ + "run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring}\0" \ /* * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, diff --git a/include/environment/ti/ti_armv7_common.env b/include/environment/ti/ti_armv7_common.env index 4d334648c05..0c0929d8628 100644 --- a/include/environment/ti/ti_armv7_common.env +++ b/include/environment/ti/ti_armv7_common.env @@ -20,5 +20,6 @@ get_overlaystring= do; setenv overlaystring ${overlaystring}'#'${overlay}; done; -run_fit=bootm ${addr_fit}#conf-${fdtfile}${overlaystring} +get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile} +run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring} |