riscv: set fdtfile on VisionFive 2

Multiple revisions of the StarFive VisionFive 2 board exist. They can be
identified by reading their EEPROM.

Linux uses two differently named device-tree files. To load the correct
device-tree we need to set $fdtfile to the device-tree file name that
matches the board revision.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
Tested-by: Milan P. Stanić <mps@arvanta.net>

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 6771d8d9198d74b8b3b602d95c1cf26e72d6f350..1c62c2345b015417485c2bbbaf41de0b3c351a44 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -26,6 +26,7 @@ config TARGET_SIFIVE_UNMATCHED
 
 config TARGET_STARFIVE_VISIONFIVE2
        bool "Support StarFive VisionFive2 Board"
+       select BOARD_LATE_INIT
 
 config TARGET_TH1520_LPI4A
        bool "Support Sipeed's TH1520 Lichee PI 4A Board"

diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c
index 07e171cfa2b5d60b7abfbbe8ed1417ce1688b23f..19b7b4458bef929d068e22d80632c9af93cd76ef 100644 (file)
--- a/board/starfive/visionfive2/starfive_visionfive2.c
+++ b/board/starfive/visionfive2/starfive_visionfive2.c
@@ -5,16 +5,22 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
-#include <asm/sections.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <env.h>
+#include <asm/arch/eeprom.h>
+#include <asm/io.h>
+#include <asm/sections.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 #define JH7110_L2_PREFETCHER_BASE_ADDR         0x2030000
 #define JH7110_L2_PREFETCHER_HART_OFFSET       0x2000
+#define FDTFILE_VISIONFIVE2_1_2A \
+       "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"
+#define FDTFILE_VISIONFIVE2_1_3B \
+       "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"
 
 /* enable U74-mc hart1~hart4 prefetcher */
 static void enable_prefetcher(void)
@@ -35,6 +41,31 @@ static void enable_prefetcher(void)
        }
 }
 
+/**
+ * set_fdtfile() - set the $fdtfile variable based on the board revision
+ */
+static void set_fdtfile(void)
+{
+       u8 version;
+       const char *fdtfile;
+
+       version = get_pcb_revision_from_eeprom();
+       switch (version) {
+       case 'a':
+       case 'A':
+               fdtfile = FDTFILE_VISIONFIVE2_1_2A;
+               break;
+
+       case 'b':
+       case 'B':
+       default:
+               fdtfile = FDTFILE_VISIONFIVE2_1_3B;
+               break;
+       };
+
+       env_set("fdtfile", fdtfile);
+}
+
 int board_init(void)
 {
        enable_caches();
@@ -43,6 +74,14 @@ int board_init(void)
        return 0;
 }
 
+int board_late_init(void)
+{
+       if (CONFIG_IS_ENABLED(ID_EEPROM))
+               set_fdtfile();
+
+       return 0;
+}
+
 void *board_fdt_blob_setup(int *err)
 {
        *err = 0;