board: starfive: visionfive2: Add Orange Pi RV selection by product_id

Add XOPIRV identifier for Orange Pi RV to dts selection callback in SPL,
and to fdtfile environment variable default value selection in payload.

Signed-off-by: E Shattow <e@freeshell.de>
Reviewed-by: Hal Feng <hal.feng@starfivetech.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c
index c607627e10fd76f792b2a19427a83748729d9164..e231467f2a16a6697b1fc4b478afeb6a5298ac44 100644 (file)
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -131,6 +131,9 @@ int board_fit_config_name_match(const char *name)
                    !strncmp(get_product_id_from_eeprom(), "MARC", 4) &&
                    !get_mmc_size_from_eeprom()) {
                return 0;
+       } else if (!strcmp(name, "starfive/jh7110-orangepi-rv") &&
+                   !strncmp(get_product_id_from_eeprom(), "XOPIRV", 6)) {
+               return 0;
        } else if (!strcmp(name, "starfive/jh7110-pine64-star64") &&
                    !strncmp(get_product_id_from_eeprom(), "STAR64", 6)) {
                return 0;

diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c
index ff510a57df5ecf869315ba9bd5ae087ae639b502..1a76f745ec8d68296657626c2a107c6be8656684 100644 (file)
--- a/board/starfive/visionfive2/starfive_visionfive2.c
+++ b/board/starfive/visionfive2/starfive_visionfive2.c
@@ -63,6 +63,8 @@ static void set_fdtfile(void)
                } else {
                        fdtfile = "starfive/jh7110-milkv-marscm-lite.dtb";
                }
+       } else if (!strncmp(get_product_id_from_eeprom(), "XOPIRV", 6)) {
+               fdtfile = "starfive/jh7110-orangepi-rv.dtb";
        } else if (!strncmp(get_product_id_from_eeprom(), "STAR64", 6)) {
                fdtfile = "starfive/jh7110-pine64-star64.dtb";
        } else if (!strncmp(get_product_id_from_eeprom(), "VF7110A", 7)) {