diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2021-05-06 16:44:51 +0530 |
|---|---|---|
| committer | Lokesh Vutla <lokeshvutla@ti.com> | 2021-05-12 16:32:44 +0530 |
| commit | 63d825e9fcc75edcf0f378995975a0b4f2632899 (patch) | |
| tree | 908e0b51e4de54db03090b19eebaa965a1b7b0b3 /board/ti | |
| parent | 8817c132a041cb62eba8f6939ff1ff44b4140ba1 (diff) | |
| download | u-boot-63d825e9fcc75edcf0f378995975a0b4f2632899.zip u-boot-63d825e9fcc75edcf0f378995975a0b4f2632899.tar.gz u-boot-63d825e9fcc75edcf0f378995975a0b4f2632899.tar.bz2 | |
board: ti: am64x: Add support for detecting multiple device trees
Update the board_fit_config_name_match() to choose the right dtb.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'board/ti')
| -rw-r--r-- | board/ti/am64x/evm.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c index 18e4911..a1ffcb9 100644 --- a/board/ti/am64x/evm.c +++ b/board/ti/am64x/evm.c @@ -46,10 +46,15 @@ int dram_init_banksize(void) #if defined(CONFIG_SPL_LOAD_FIT) int board_fit_config_name_match(const char *name) { -#if defined(CONFIG_TARGET_AM642_A53_EVM) - if (!strcmp(name, "k3-am642-evm")) - return 0; -#endif + bool eeprom_read = board_ti_was_eeprom_read(); + + if (!eeprom_read || board_is_am64x_gpevm()) { + if (!strcmp(name, "k3-am642-r5-evm") || !strcmp(name, "k3-am642-evm")) + return 0; + } else if (board_is_am64x_skevm()) { + if (!strcmp(name, "k3-am642-r5-sk") || !strcmp(name, "k3-am642-sk")) + return 0; + } return -1; } |