| Message ID | 20250424121315.144549-5-heinrich.schuchardt@canonical.com |
|---|---|
| State | Accepted, archived |
| Commit | 62dad88db25545a2e0b04d570c4b28fae25849cc |
| Delegated to: | Andes |
| Headers | show |
| Series | board: starfive: DeepComputing FML13V01 | expand |
In a different series I refactor this logic to match the sorting of configs/starfive_visionfive2_defconfig:CONFIG_OF_LIST but now is more important to get this variant added to VF2 board target in U-Boot as done here. On 4/24/25 05:13, Heinrich Schuchardt wrote: > On the DeepComputing Framework motherboard (FML13V01) choose the matching > FIT configuration. > > Reviewed-by: Hal Feng <hal.feng@starfivetech.com> > Reviewed-by: Matthias Brugger <mbrugger@suse.com> > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > --- > v4: > no change > v3: > no change > v2: > rebased > --- > board/starfive/visionfive2/spl.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c > index 3e4d3e21988..9a3081ef06f 100644 > --- a/board/starfive/visionfive2/spl.c > +++ b/board/starfive/visionfive2/spl.c > @@ -125,7 +125,10 @@ int board_fit_config_name_match(const char *name) > if (strncmp(name, "starfive/", 9)) > return -EINVAL; > name += 9; > - if (!strncmp(product_id, "VF7110", 6)) { > + 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")) Reviewed-by: E Shattow <e@freeshell.de>
diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index 3e4d3e21988..9a3081ef06f 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -125,7 +125,10 @@ int board_fit_config_name_match(const char *name) if (strncmp(name, "starfive/", 9)) return -EINVAL; name += 9; - if (!strncmp(product_id, "VF7110", 6)) { + 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"))