colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-riscv

Browse Source 
CI: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/25940

- riscv: lib: Simplify FDT retrieving process
- board: k1: pinctrl: Add pinctrl support for bananapi-f3
- binman: riscv: Fix binman_sym functionality
- board: starfive: visionfive2: Reorder board detection logic
- board: starfive: Add DeepComputing FML13V01 support
This commit is contained in:
Tom Rini
2025-04-25 13:13:17 -06:00
parent 7a9c9b5655 5ac699efe9
commit 5a0a93a768
17 changed files with 79 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
board/emulation/qemu-riscv/qemu-riscv.c
View File

@@ -63,11 +63,3 @@ int board_fit_config_name_match(const char *name)
return 0;
}
#endif
int board_fdt_blob_setup(void **fdtp)
{
/* Stored the DTB address there during our init */
*fdtp = (void *)(ulong)gd->arch.firmware_fdt_addr;
return 0;
}

11
board/sifive/unleashed/unleashed.c
View File

@@ -114,17 +114,6 @@ int misc_init_r(void)
#endif
int board_fdt_blob_setup(void **fdtp)
{
if (gd->arch.firmware_fdt_addr) {
*fdtp = (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr;
return 0;
}
return -EEXIST;
}
int board_init(void)
{
/* enable all cache ways */

10
board/sifive/unmatched/unmatched.c
View File

@@ -10,16 +10,6 @@
#include <dm.h>
#include <asm/sections.h>
int board_fdt_blob_setup(void **fdtp)
{
if (gd->arch.firmware_fdt_addr) {
*fdtp = (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr;
return 0;
}
return -EEXIST;
}
int board_init(void)
{
/* enable all cache ways */

2
board/starfive/visionfive2/MAINTAINERS
View File

@@ -2,6 +2,6 @@ STARFIVE JH7110 VISIONFIVE2 BOARD
M: Minda Chen <minda.chen@starfivetech.com>
M: Hal Feng <hal.feng@starfivetech.com>
S: Maintained
F: drivers/ram/starfive/
N: starfive
N: jh7110
N: visionfive2

21
board/starfive/visionfive2/spl.c
View File

@@ -140,9 +140,26 @@ int board_fit_config_name_match(const char *name)
} else if (!strncmp(product_id, "MARS", 4) &&
!strcmp(name, "jh7110-milkv-mars")) {
return 0;
} else if (!strncmp(product_id, "STAR64", 6) &&
!strcmp(name, "jh7110-pine64-star64")) {
} else if (!strcmp(name, "starfive/jh7110-milkv-mars") &&
!strncmp(get_product_id_from_eeprom(), "MARS", 4)) {
return 0;
} 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;

10
board/starfive/visionfive2/starfive_visionfive2.c
View File

@@ -110,16 +110,6 @@ int board_late_init(void)
return 0;
}
int board_fdt_blob_setup(void **fdtp)
{
if (gd->arch.firmware_fdt_addr) {
*fdtp = (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr;
return 0;
}
return -EEXIST;
}
int ft_board_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_memory(blob, 0x40000000, gd->ram_size);