diff options
| author | Tom Rini <trini@konsulko.com> | 2023-06-11 23:23:32 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-06-11 23:23:32 +0300 |
| commit | c13a1c22a20ea6e1fb0df934af2dfa4521a83697 (patch) | |
| tree | ac8a5287f0501499b3a8334f33483981079b229b | |
| parent | addd47379df54a3eb247c6db4f799f14af43e523 (diff) | |
| parent | fd3e2b4de366a32cd342675bdcd43b72159913ee (diff) | |
| download | u-boot-c13a1c22a20ea6e1fb0df934af2dfa4521a83697.tar.xz | |
Merge branch 'master_reserved' of https://source.denx.de/u-boot/custodians/u-boot-sh
| -rw-r--r-- | board/renesas/rcar-common/common.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c index f38453af82..f976c99028 100644 --- a/board/renesas/rcar-common/common.c +++ b/board/renesas/rcar-common/common.c @@ -25,12 +25,17 @@ extern u64 rcar_atf_boot_args[]; #define FDT_RPC_PATH "/soc/spi@ee200000" -int fdtdec_board_setup(const void *fdt_blob) +static void apply_atf_overlay(void *fdt_blob) { void *atf_fdt_blob = (void *)(rcar_atf_boot_args[1]); if (fdt_magic(atf_fdt_blob) == FDT_MAGIC) - fdt_overlay_apply_node((void *)fdt_blob, 0, atf_fdt_blob, 0); + fdt_overlay_apply_node(fdt_blob, 0, atf_fdt_blob, 0); +} + +int fdtdec_board_setup(const void *fdt_blob) +{ + apply_atf_overlay((void *)fdt_blob); return 0; } @@ -159,6 +164,7 @@ static void update_rpc_status(void *blob) int ft_board_setup(void *blob, struct bd_info *bd) { + apply_atf_overlay(blob); scrub_duplicate_memory(blob); update_rpc_status(blob); |