Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2049CC352A1 for ; Tue, 6 Dec 2022 16:07:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 286E485020; Tue, 6 Dec 2022 17:07:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="MKuWhMAC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E5EC8850FC; Tue, 6 Dec 2022 17:07:07 +0100 (CET) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A4A2083A26 for ; Tue, 6 Dec 2022 17:07:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=detlev.casanova@collabora.com Received: from Falcon9.mtl.collabora.ca (mtl.collabora.ca [66.171.169.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by madras.collabora.co.uk (Postfix) with ESMTPSA id B86D46602B2C; Tue, 6 Dec 2022 16:07:04 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1670342825; bh=NiJ8pBFVEmb58gP2SYEGdeaeRuYdjRmxlKjRd+FjzFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MKuWhMACdF6WSW/Zj7OOt//zzYOUx/IeYcLxjrDeDhf6boz3Ls/O1EKOt894B38rO YPok91q3UMc5OBWjXdaxObGaT6ODI0VlkkrQpeSWcd1flE2WTlz7BIa95PWF28xhQZ UqXJMiuUwzyl8hBjfMW33lUKX6qpYGy5p4QsdqUHGLcKMFYBaw1je+1lRkIEvMivie rG89Btn49pzQL4+oeZMnwGmXhdYkZYCeLN8a/fQVcsRArgw3WQdiCdwixZFCEr91je +nsoy9TTAl3CS9OAb6FJwdZKw9Q5297SOv5mMtKMcf0K9m8I5xiTdulPYQqAf0wW4G IssRF8jbpnnZQ== From: Detlev Casanova To: u-boot@lists.denx.de Cc: Geert Uytterhoeven , Detlev Casanova Subject: [PATCH v2] renesas: rcar: Apply ATF overlay for reserved-memory Date: Tue, 6 Dec 2022 11:06:48 -0500 Message-Id: <20221206160648.174707-1-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean The function fdtdec_board_setup() is only called by fdtdec_setup() which needs to be called by the board file. This is not the case for the renesas boards so rename the fdtdec_board_setup() function to a local name and call it directly from ft_board_setup(), before cleaning up the memory nodes. Signed-off-by: Detlev Casanova --- board/renesas/rcar-common/common.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c index daa1beb14f..c50d09ef8b 100644 --- a/board/renesas/rcar-common/common.c +++ b/board/renesas/rcar-common/common.c @@ -25,16 +25,6 @@ extern u64 rcar_atf_boot_args[]; #define FDT_RPC_PATH "/soc/spi@ee200000" -int fdtdec_board_setup(const 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); - - return 0; -} - int dram_init(void) { return fdtdec_setup_mem_size_base(); @@ -48,6 +38,14 @@ int dram_init_banksize(void) } #if defined(CONFIG_OF_BOARD_SETUP) +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(fdt_blob, 0, atf_fdt_blob, 0); +} + static int is_mem_overlap(void *blob, int first_mem_node, int curr_mem_node) { struct fdt_resource first_mem_res, curr_mem_res; @@ -159,6 +157,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); -- 2.38.1