diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-26 16:45:41 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-26 16:45:41 +0300 |
| commit | 964aae164414b15ef91a0319decb13e7e2c06b52 (patch) | |
| tree | aaee8dd0669563e3d9d2ca9b69a6da5c86035084 | |
| parent | 15155ab0a3d1f839509bcac620bfb38f950bead6 (diff) | |
| parent | 16dbe3d9d45527f67d479535a22dc4054ae93e99 (diff) | |
| download | u-boot-964aae164414b15ef91a0319decb13e7e2c06b52.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscv
+ Fix VisionFive2 booting issue by providing the correct FDT.
| -rw-r--r-- | arch/riscv/Kconfig | 1 | ||||
| -rw-r--r-- | board/starfive/visionfive2/starfive_visionfive2.c | 43 |
2 files changed, 42 insertions, 2 deletions
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 6771d8d919..1c62c2345b 100644 --- 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 07e171cfa2..19b7b4458b 100644 --- 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; |