board: starfive: visionfive2: Order board detection logic to match config
PATCH 1/1 board: starfive: visionfive2: Order board detection logic to match config
Refactor inside-out EEPROM-checking logic to better match the board-seeking callback and ordered list of targets from starfive_visionfive2_config since the JH7110 OF_UPSTREAM migration.
Signed-off-by E Shattow <[email protected]>
--- board/starfive/visionfive2/spl.c | 40 ++++++++++++++------------------ 1 file changed, 18 insertions(+), 22 deletions(-)
board/starfive/visionfive2/spl.c +18 -22
@@ -116,30 +116,26 @@ 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,"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-milkv-mars" ) && + !strncmp (get_product_id_from_eeprom (),"MARS" ,4 )) {return 0 ; - }else if (!strncmp (product_id,"STAR64" ,6 ) && - !strcmp (name,"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" )) && + !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" )) && + !strncmp (get_product_id_from_eeprom (),"VF7110" ,6 )) { +switch (get_pcb_revision_from_eeprom ()) { +case 'b' : +case 'B' : +return 0 ; + } }return -EINVAL ;
base-commit: cde0050618968aae335dfbc930641656d51ff5d0
prerequisite-patch-id: 3fdb915979e0c14c53e387fcf00d2dcaae28165e
prerequisite-patch-id: 1a0c600d97801d90a464a645794ae65df41f2789
Signature · 1 line
2.49.0
Quoted 8 lines · E Shattow
Refactor inside-out EEPROM-checking logic to better match the board-seeking callback and ordered list of targets from
starfive_visionfive2_configsince the JH7110OF_UPSTREAMmigration.Signed-off-by E Shattow <[email protected]>--- board/starfive/visionfive2/spl.c | 40 ++++++++++++++------------------ 1 file changed, 18 insertions(+), 22 deletions(-)
Reviewed-by Leo Yu-Chi Liang <[email protected]>