Skip to content
Snippets Groups Projects
Commit c17e7857 authored by Detlev Casanova's avatar Detlev Casanova
Browse files

d/patches: rcar: Add ATF overlay


The patch is needed to make sure that the reserved memory regions are
transfered to the linux FDT.

Signed-off-by: default avatarDetlev Casanova <detlev.casanova@collabora.com>
parent adc30892
No related branches found
No related tags found
4 merge requests!105Merge changes from apertis/v2023-updates into apertis/v2023,!103[v2023 <- v2024dev2] d/patches: rcar: Add ATF overlay and select correct linux dtb,!101Update from debian/bookworm for apertis/v2024dev2,!97d/patches: rcar: Add ATF overlay and select correct linux dtb
From: Detlev Casanova <detlev.casanova@collabora.com>
Date: Tue, 6 Dec 2022 10:17:55 -0500
Subject: renesas: rcar: Apply ATF overlay for reserved-memory
The function fdtdec_board_setup() is called early and adds the overlay
from ATF to the u-boot device tree. That is necessary so that u-boot
doesn't use reserved memory.
Linux also needs to know about that reserved memory so the overlay from
ATF needs to be aplied on the linux device tree as well.
This commit makes sure that the ATF overlay is applied to both device trees.
Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
---
board/renesas/rcar-common/common.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index daa1beb..903959c 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);
......@@ -54,6 +54,7 @@ apertis/renesas/0003-renesas-enable-bootcount.patch
apertis/renesas/0004-renesas-use-alternative-boot-for-rollback.patch
apertis/renesas/0005-renesas-Disable-CMD_I2C-config-option.patch
apertis/renesas/0058-Disable-CMD_SPI-config-option.patch
apertis/renesas/0077-renesas-rcar-Apply-ATF-overlay-for-reserved-memory.patch
# Patches for Renesas allowing to boot images with different FDT naming schemas
apertis/renesas/0101-ARM-rcar_gen3-boot-with-legacy-FDT.patch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment