From mboxrd@z Thu Jan 1 00:00:00 1970 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 3EEFDC7EE29 for ; Fri, 9 Jun 2023 16:01:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 39CB286129; Fri, 9 Jun 2023 18:00:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine 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="JcZ86rHc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F21F78581C; Fri, 9 Jun 2023 18:00:32 +0200 (CEST) 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 6FE94847C3 for ; Fri, 9 Jun 2023 18:00:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=detlev.casanova@collabora.com Received: from arisu.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 7A9AF6606F33; Fri, 9 Jun 2023 17:00:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686326427; bh=lxIDcG+BJc56CuVt+V+UF+XGYlMOXF2ICC1wKKyvm3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JcZ86rHcxspT64u/KXTHw1HFeZ8uMkHV9tGYN150SB/IduufBF3o/R/Ik4vNiVbBw /cXloEwQ9hnDfUfwROO2P1uV0uTY+L4HD1MwXepn+qPzK9Uk0AoICCnOcGK6LvijfW mjB8X31FuHmF8OBgdQFzz0NA5AHbqzaYMe3Te194HHHxNIF7eGjUSrcwoiwVSlJdyG QyJwsSn3Y40EDUD3mlvYmx7yVrns/dq7fVypCaX03Dxhxvm1YIJCHdt22IADTvEu/3 n3qvZ09GMNL+q9JqIYUnMdf14lL/joPErA1BQQqZHL8Wst0YRZg9ry+arxiKP4V/xw TmrNMmXjhvKig== From: Detlev Casanova To: u-boot@lists.denx.de Cc: Marek Vasut , Hai Pham , Tam Nguyen , Detlev Casanova Subject: [PATCH 2/2] renesas: rcar3: Load the correct device tree Date: Fri, 9 Jun 2023 12:00:16 -0400 Message-Id: <20230609160016.128417-3-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230609160016.128417-1-detlev.casanova@collabora.com> References: <20230609160016.128417-1-detlev.casanova@collabora.com> 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.8 at phobos.denx.de X-Virus-Status: Clean The Renesas R-Car Gen3 H3e (Starter Kit Premier) uses a different device tree than the default one. This uses the sysinfo's board id to determine if the board needs a specific device tree. Signed-off-by: Detlev Casanova --- board/renesas/ulcb/ulcb.c | 34 ++++++++++++++++++++++++++++++++++ configs/rcar3_ulcb_defconfig | 1 + 2 files changed, 35 insertions(+) diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 1477750f921..3e2fe3a3ca9 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -28,6 +28,8 @@ #include #include +#include "../../../drivers/sysinfo/rcar3.h" + DECLARE_GLOBAL_DATA_PTR; #define DVFS_MSTP926 BIT(26) @@ -65,6 +67,38 @@ int board_init(void) return 0; } +int misc_init_r(void) +{ + struct udevice *dev; + int board_id; + int ret = sysinfo_get(&dev); + if (ret) { + debug("Cannot get sysinfo: %d\n", ret); + return 0; + } + + ret = sysinfo_detect(dev); + if (ret) { + debug("Cannot detect sysinfo: %d\n", ret); + return 0; + } + + ret = sysinfo_get_int(dev, + SYSINFO_ID_BOARD_MODEL, + &board_id); + + if (ret) { + debug("Cannot get sysinfo int: %d\n", ret); + return 0; + } + + if (board_id == BOARD_STARTER_KIT_PRE) { + env_set("fdtfile", "renesas/r8a779m1-ulcb.dtb"); + } + + return 0; +} + #ifdef CONFIG_MULTI_DTB_FIT int board_fit_config_name_match(const char *name) { diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig index b8fdb5e3826..752d33d77ec 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -111,3 +111,4 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_STORAGE=y +CONFIG_MISC_INIT_R=y -- 2.39.3