diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-21 15:56:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-21 15:56:47 -0400 |
| commit | d01a8541d62d78ad76706617e9f8690c8cb01fb8 (patch) | |
| tree | 3b6475185cf5cb22d804bc257be5239326a7b6ca | |
| parent | b9b83a86f0e84e837191db120c279a9cc0e3434b (diff) | |
| parent | 43177705ab29ed1ccca970096de1ef3c6095e7e6 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscv
- Fixup memory size passed to kernel on visionfive2
| -rw-r--r-- | board/starfive/visionfive2/starfive_visionfive2.c | 7 | ||||
| -rw-r--r-- | configs/starfive_visionfive2_defconfig | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c index 07dcca26b3..07e171cfa2 100644 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@ -9,8 +9,10 @@ #include <asm/sections.h> #include <cpu_func.h> #include <dm.h> +#include <fdt_support.h> #include <linux/bitops.h> +DECLARE_GLOBAL_DATA_PTR; #define JH7110_L2_PREFETCHER_BASE_ADDR 0x2030000 #define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000 @@ -51,3 +53,8 @@ void *board_fdt_blob_setup(int *err) return (ulong *)&_end; } + +int ft_board_setup(void *blob, struct bd_info *bd) +{ + return fdt_fixup_memory(blob, 0x40000000, gd->ram_size); +} diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index 9df6fcee0f..8abe645cd1 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -36,6 +36,7 @@ CONFIG_SPL_OPENSBI_LOAD_ADDR=0x40000000 CONFIG_ARCH_RV64I=y CONFIG_CMODEL_MEDANY=y CONFIG_RISCV_SMODE=y +CONFIG_OF_BOARD_SETUP=y # CONFIG_OF_BOARD_FIXUP is not set CONFIG_FIT=y CONFIG_DISTRO_DEFAULTS=y |