board: starfive: visionfive2: Order board detection logic to match config
PATCH v2 1/1 board: starfive: visionfive2: Order board detection logic to match config
Fixup previous merge resolution of this series. Intent is to ease code readability and logic to match ordering in CONFIG_OF_LIST
- Remove "starfive/" string math
- Remove redundant local cache of calls to get_*_from_eeprom()
- Match name before EEPROM product_id in board_fit_config_name_match()
- Remove single-consumer FDTFILE_* defines
- Do not set fdtfile for visionfive-2-* when unknown model revision
--- board/starfive/visionfive2/spl.c | 33 +++----------- .../visionfive2/starfive_visionfive2.c | 43 +++++++------------ 2 files changed, 21 insertions(+), 55 deletions(-)
board/starfive/visionfive2/spl.c +6 -27
@@ -116,44 +116,23 @@ void board_init_f(ulong dummy)#if CONFIG_IS_ENABLED (LOAD_FIT )int board_fit_config_name_match (const char *name) { -const char *product_id; -u8 version; - - product_id =get_product_id_from_eeprom (); - -/* Strip off prefix */ -if (strncmp (name,"starfive/" ,9 )) -return -EINVAL ; - name +=9 ; -if (!strncmp (product_id,"FML13V01" ,8 ) && - !strcmp (name,"jh7110-deepcomputing-fml13v01" )) { -return 0 ; - }else if (!strncmp (product_id,"VF7110" ,6 )) { - version =get_pcb_revision_from_eeprom (); -if ((version =='b' || version =='B' ) && - !strcmp (name,"jh7110-starfive-visionfive-2-v1.3b" )) -return 0 ; - -if ((version =='a' || version =='A' ) && - !strcmp (name,"jh7110-starfive-visionfive-2-v1.2a" )) -return 0 ; - }else if (!strncmp (product_id,"MARS" ,4 ) && - !strcmp (name,"jh7110-milkv-mars" )) { +if (!strcmp (name,"starfive/jh7110-deepcomputing-fml13v01" ) && + !strncmp (get_product_id_from_eeprom (),"FML13V01" ,8 )) {return 0 ; }else if (!strcmp (name,"starfive/jh7110-milkv-mars" ) && - !strncmp (get_product_id_from_eeprom (),"MARS" ,4 )) { + !strncmp (get_product_id_from_eeprom (),"MARS" ,4 )) {return 0 ; - }else if ((!strcmp (name,"starfive/jh7110-pine64-star64" )) && + }else if (!strcmp (name,"starfive/jh7110-pine64-star64" ) && !strncmp (get_product_id_from_eeprom (),"STAR64" ,6 )) {return 0 ; - }else if ((!strcmp (name,"starfive/jh7110-starfive-visionfive-2-v1.2a" )) && + }else if (!strcmp (name,"starfive/jh7110-starfive-visionfive-2-v1.2a" ) && !strncmp (get_product_id_from_eeprom (),"VF7110" ,6 )) {switch (get_pcb_revision_from_eeprom ()) {case 'a' :case 'A' :return 0 ; } - }else if ((!strcmp (name,"starfive/jh7110-starfive-visionfive-2-v1.2b" )) && + }else if (!strcmp (name,"starfive/jh7110-starfive-visionfive-2-v1.3b" ) && !strncmp (get_product_id_from_eeprom (),"VF7110" ,6 )) {switch (get_pcb_revision_from_eeprom ()) {case 'b' :
board/starfive/visionfive2/starfive_visionfive2.c +15 -28
75 lines not on this page · raw message
base-commit: 5a0a93a768487e55ebe50a34cc90d751bf99cc56
Signature · 1 line
2.49.0
Quoted 10 lines · E Shattow
Fixup previous merge resolution of this series. Intent is to ease code readability and logic to match ordering in
CONFIG_OF_LIST- Remove "starfive/" string math
- Remove redundant local cache of calls to get_*_from_eeprom()
- Match name before EEPROMproduct_idinboard_fit_config_name_match()
- Remove single-consumer FDTFILE_* defines
- Do not set fdtfile for visionfive-2-* when unknown model revision[...]
Applied to u-boot/master, thanks!
[1/1] board: starfive: visionfive2: Order board detection logic to match config
commit: 62ea9c329a0d013993bae538c55dfea06e4551bd
Signature · 1 line
Tom