On 04/07/2023 21:10, Roger Quadros wrote:
use "am64x_evm" board name in environment for both AM64-GPEVM and AM64-HSEVM.
Gets rid of "Unidentified board claims AM64-HSEVM in eeprom header"
Signed-off-by: Roger Quadros rogerq@kernel.org
board/ti/am64x/evm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c index 96f4e3013a..42795cbd22 100644 --- a/board/ti/am64x/evm.c +++ b/board/ti/am64x/evm.c @@ -18,7 +18,8 @@
#include "../common/board_detect.h"
-#define board_is_am64x_gpevm() board_ti_k3_is("AM64-GPEVM") +#define board_is_am64x_evm() (board_ti_k3_is("AM64-GPEVM") || \
board_ti_k3_is("AM64-HSEVM"))#define board_is_am64x_skevm() (board_ti_k3_is("AM64-SKEVM") || \ board_ti_k3_is("AM64B-SKEVM")) @@ -57,7 +58,7 @@ int board_fit_config_name_match(const char *name) { bool eeprom_read = board_ti_was_eeprom_read();
- if (!eeprom_read || board_is_am64x_gpevm()) {
- if (!eeprom_read || board_is_am64x_evm()) { if (!strcmp(name, "k3-am642-r5-evm") || !strcmp(name, "k3-am642-evm")) return 0; } else if (board_is_am64x_skevm()) {
@@ -182,13 +183,13 @@ int checkboard(void) #ifdef CONFIG_BOARD_LATE_INIT static void setup_board_eeprom_env(void) {
- char *name = "am64x_gpevm";
char *name = "am64x_evm";
if (do_board_detect()) goto invalid_eeprom;
- if (board_is_am64x_gpevm())
name = "am64x_gpevm";
- if (board_is_am64x_evm())
name = "am64x_evm";
"board/ti/am64x/am64x.env: if test $board_name = am64x_gpevm; then"
So I think it was a bad idea to change the name here. Will revert this change.
else if (board_is_am64x_skevm()) name = "am64x_skevm"; else