From patchwork Thu Feb 27 14:47:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Zi X-Patchwork-Id: 2053075 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=E7oLWScn; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Z3Z3C3KWPz1xrB for ; Fri, 28 Feb 2025 01:48:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8AA2C810FE; Thu, 27 Feb 2025 15:48:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org 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; secure) header.d=disroot.org header.i=@disroot.org header.b="E7oLWScn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B656781113; Thu, 27 Feb 2025 15:48:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (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 C931E80BA4 for ; Thu, 27 Feb 2025 15:48:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ziyao@disroot.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8FD0823058; Thu, 27 Feb 2025 15:48:28 +0100 (CET) Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 7mH3WiVRzWYn; Thu, 27 Feb 2025 15:48:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740667688; bh=EYka4PhaQi1nT2x9oAfYHP1aPW2tiHeHwGrWUOMYXL4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=E7oLWScnOe5tMD/7r2wFCNCucmIv4slAZ+rnMutR3qhDM5Yo0sT2mDomkWrxwAhF+ dtpq85oYP0kztkpdXN+tMHa+yuBHUQz2rKyDQGGMkl3yfUjqCwSmPgg34mEKooMYiz 3V86G8o3OmH/B9DB+S9vBSyXjiQIw8H2CpOHmjQPFumZqfWrr4S4GAvqQh0zSA/02P V0dT3g19KCuD6RYUnGg9q99zhSGVjnWRf/kjc9jh5cZ/LR2EonOcYBb9Hs+opRBfFW VUkS6iXU976JGpTNP0WjdKwXo65Yjgb7QXnfZ4fCr+6OjKN4hrluqOpUZUl68gtZ5n +KJSlecfdHAEQ== From: Yao Zi To: Rick Chen , Leo , Tom Rini , Bin Meng , Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Green Wan , Minda Chen , Simon Glass , Angelo Dureghello , Ilias Apalodimas , Heinrich Schuchardt Cc: u-boot@lists.denx.de, Yao Zi Subject: [PATCH 1/5] riscv: lib: Add a default implementation of board_fdt_blob_setup Date: Thu, 27 Feb 2025 14:47:29 +0000 Message-ID: <20250227144734.61458-2-ziyao@disroot.org> In-Reply-To: <20250227144734.61458-1-ziyao@disroot.org> References: <20250227144734.61458-1-ziyao@disroot.org> MIME-Version: 1.0 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 It's common for S-Mode U-Boot to retrieve a FDT blob along with taking control from SBI firmware. Add a weak version of board_fdt_blob_setup to make use of it by default and avoid copy-pasting similar functions among boards. Signed-off-by: Yao Zi Reviewed-by: Leo Yu-Chi Liang --- arch/riscv/lib/Makefile | 1 + arch/riscv/lib/board.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 arch/riscv/lib/board.c diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 268116f3757..b33f9c646dd 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_$(XPL_)SMP) += smp.o obj-$(CONFIG_XPL_BUILD) += spl.o obj-y += fdt_fixup.o obj-$(CONFIG_$(SPL)CMD_BDI) += bdinfo.o +obj-$(CONFIG_OF_BOARD) += board.o # For building EFI apps CFLAGS_NON_EFI := -fstack-protector-strong diff --git a/arch/riscv/lib/board.c b/arch/riscv/lib/board.c new file mode 100644 index 00000000000..77bc174b047 --- /dev/null +++ b/arch/riscv/lib/board.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * RISC-V-specific handling of firmware FDT + */ + +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +__weak int board_fdt_blob_setup(void **fdtp) +{ + if (!gd->arch.firmware_fdt_addr) + return -EEXIST; + + *fdtp = (void *)gd->arch.firmware_fdt_addr; + + return 0; +} From patchwork Thu Feb 27 14:47:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Zi X-Patchwork-Id: 2053073 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=UNyCyuZU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Z3Z2p6pXVz1xrB for ; Fri, 28 Feb 2025 01:48:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD36680FE1; Thu, 27 Feb 2025 15:48:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org 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; secure) header.d=disroot.org header.i=@disroot.org header.b="UNyCyuZU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B6A8810F4; Thu, 27 Feb 2025 15:48:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (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 9C86C80FE1 for ; Thu, 27 Feb 2025 15:48:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ziyao@disroot.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5F6A625549; Thu, 27 Feb 2025 15:48:14 +0100 (CET) Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8cX0fPRboAqE; Thu, 27 Feb 2025 15:48:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740667693; bh=ivVPWeJhSo2RUdoZfYBKqHRZNXGpeCMImHNBK/Ly0+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UNyCyuZUAS4xjWmi1WltaujmibAPdrBje2SvaUYrFCx5og810oojOf3vSYx0yItOj rJsbY/pjsjcmmapYbGuh03bS+8xLD/q83j2WXIJCwp+giyqXKquyMmIamzj9YP98q1 UIBE+Ljd/mQatZF4KwoGPmHdbj8xThU6E03lvgvy+/hKxsqYY4V24LzNnfSSYfSybV Myx/KXRGtb3hmp6dwKwYr2wKiL96xeNJ6811273TrmZV9h/sqnLMCUykyrW20QqXXs 43Fs7+XUEGsHBn0JuBGhGWX6NhasBgbmO+e60oRD+00Yhkw2u0q9oF2/Xkiw/o/P4b IGuMQh0Wiknaw== From: Yao Zi To: Rick Chen , Leo , Tom Rini , Bin Meng , Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Green Wan , Minda Chen , Simon Glass , Angelo Dureghello , Ilias Apalodimas , Heinrich Schuchardt Cc: u-boot@lists.denx.de, Yao Zi Subject: [PATCH 2/5] board: qemu: riscv: Remove duplicated board_fdt_blob_setup Date: Thu, 27 Feb 2025 14:47:30 +0000 Message-ID: <20250227144734.61458-3-ziyao@disroot.org> In-Reply-To: <20250227144734.61458-1-ziyao@disroot.org> References: <20250227144734.61458-1-ziyao@disroot.org> MIME-Version: 1.0 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 default version should work for RISC-V QEMU. Signed-off-by: Yao Zi Reviewed-by: Leo Yu-Chi Liang --- board/emulation/qemu-riscv/qemu-riscv.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c index a90222ea6a4..70190ebe8fc 100644 --- a/board/emulation/qemu-riscv/qemu-riscv.c +++ b/board/emulation/qemu-riscv/qemu-riscv.c @@ -63,11 +63,3 @@ int board_fit_config_name_match(const char *name) return 0; } #endif - -int board_fdt_blob_setup(void **fdtp) -{ - /* Stored the DTB address there during our init */ - *fdtp = (void *)(ulong)gd->arch.firmware_fdt_addr; - - return 0; -} From patchwork Thu Feb 27 14:47:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Zi X-Patchwork-Id: 2053077 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=EBVcaSYQ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Z3Z3T426wz1yKR for ; Fri, 28 Feb 2025 01:48:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 06E6E80FF4; Thu, 27 Feb 2025 15:48:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org 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; secure) header.d=disroot.org header.i=@disroot.org header.b="EBVcaSYQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 02FCE810F4; Thu, 27 Feb 2025 15:48:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (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 1A9AB80BA4 for ; Thu, 27 Feb 2025 15:48:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ziyao@disroot.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id CC063252F3; Thu, 27 Feb 2025 15:48:49 +0100 (CET) Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 3G_wj_lCpDQi; Thu, 27 Feb 2025 15:48:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740667699; bh=Y1+SFRhB59UXaD5A4A3rX2nYfAwhRhXEAP2dJDsxCho=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EBVcaSYQkr7gHw/hobEtkefNQCTHNuGwqpNdeU8dr3Q9ZFgK0rqTyxT8dnqNE3Krz GTNqaui5hWXdSVVYmP5zzyk8IFqzNoKzGNP6BXTEpQc0BzfLl+WphW1FQRDUNl3CEy GV39mx7Q4T180PwbFy28WA2MW/Kw/MUgARAFwyl/A2SOidt5MWHp8Xf2TgnZil3SOl 3L3L9Xt4rrNEAbO6tIrzg6YTjyKkaigY5c1thx7SDLU9lm1An2u/c+pfFrMhrjN+5E V+OQM177xp7hpbQgaBeQnabp39OjU3GElgkKeAlxmv5cCym+kbuQ45GxBWZgszHsE5 kPKI/J10mdCJg== From: Yao Zi To: Rick Chen , Leo , Tom Rini , Bin Meng , Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Green Wan , Minda Chen , Simon Glass , Angelo Dureghello , Ilias Apalodimas , Heinrich Schuchardt Cc: u-boot@lists.denx.de, Yao Zi Subject: [PATCH 3/5] board: starfive: Remove duplicated board_fdt_blob_setup Date: Thu, 27 Feb 2025 14:47:31 +0000 Message-ID: <20250227144734.61458-4-ziyao@disroot.org> In-Reply-To: <20250227144734.61458-1-ziyao@disroot.org> References: <20250227144734.61458-1-ziyao@disroot.org> MIME-Version: 1.0 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 default version should work for Starfive VisionFive 2. Signed-off-by: Yao Zi Reviewed-by: Leo Yu-Chi Liang --- board/starfive/visionfive2/starfive_visionfive2.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c index 3940d45b13f..96fb8dfe934 100644 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@ -115,16 +115,6 @@ int board_late_init(void) return 0; } -int board_fdt_blob_setup(void **fdtp) -{ - if (gd->arch.firmware_fdt_addr) { - *fdtp = (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr; - return 0; - } - - return -EEXIST; -} - int ft_board_setup(void *blob, struct bd_info *bd) { return fdt_fixup_memory(blob, 0x40000000, gd->ram_size); From patchwork Thu Feb 27 14:47:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Zi X-Patchwork-Id: 2053074 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=bVZxQkvh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Z3Z315mFrz1xrB for ; Fri, 28 Feb 2025 01:48:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 43C6881101; Thu, 27 Feb 2025 15:48:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org 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; secure) header.d=disroot.org header.i=@disroot.org header.b="bVZxQkvh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 654F180BA4; Thu, 27 Feb 2025 15:48:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (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 79D9780BA4 for ; Thu, 27 Feb 2025 15:48:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ziyao@disroot.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 476D225B4D; Thu, 27 Feb 2025 15:48:26 +0100 (CET) Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id D5eHi2v6RadN; Thu, 27 Feb 2025 15:48:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740667705; bh=I2kwGqgoNG+nHMtqfcJYGaOkEdeCVVUYJFKSaivhs2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bVZxQkvhWo6CkdAeGH64pUcXKNphHgcyiXHB56svMoYgkA68TvFzNAxqWBqf5XPkh ATV0Q6Q40g7yGEyX8WnmBN4cxqVVihLCE1rxb0ozIO6DoQJaoYuHUmWqrxGbE6FGTZ 4++O7cGH82tCOQEG+CmmgTOVreCpF+dK3JWfc46ToBodusHec06JSsHNzQxI3hLG8u GZWLWBS2DhIU8LUtmKnjKmZ2RO6+qN2wzCpGXrbFak9YE3Yo5tBr+rUGDzX3wuQYc8 35kmbHBgO1qE034aWWu9GGl5roZ7b4ZlH6YF6f37StUMx3lSWOppXldGft0J7uTrke KqbCFvJNjVKag== From: Yao Zi To: Rick Chen , Leo , Tom Rini , Bin Meng , Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Green Wan , Minda Chen , Simon Glass , Angelo Dureghello , Ilias Apalodimas , Heinrich Schuchardt Cc: u-boot@lists.denx.de, Yao Zi Subject: [PATCH 4/5] board: sifive: Remove duplicated board_fdt_blob_setup Date: Thu, 27 Feb 2025 14:47:32 +0000 Message-ID: <20250227144734.61458-5-ziyao@disroot.org> In-Reply-To: <20250227144734.61458-1-ziyao@disroot.org> References: <20250227144734.61458-1-ziyao@disroot.org> MIME-Version: 1.0 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 default version should work for both SiFive Unmatched and Unleashed. Signed-off-by: Yao Zi Reviewed-by: Leo Yu-Chi Liang --- board/sifive/unleashed/unleashed.c | 11 ----------- board/sifive/unmatched/unmatched.c | 10 ---------- 2 files changed, 21 deletions(-) diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c index c1c374610c3..f5da289b836 100644 --- a/board/sifive/unleashed/unleashed.c +++ b/board/sifive/unleashed/unleashed.c @@ -114,17 +114,6 @@ int misc_init_r(void) #endif -int board_fdt_blob_setup(void **fdtp) -{ - if (gd->arch.firmware_fdt_addr) { - *fdtp = (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr; - - return 0; - } - - return -EEXIST; -} - int board_init(void) { /* enable all cache ways */ diff --git a/board/sifive/unmatched/unmatched.c b/board/sifive/unmatched/unmatched.c index 23e03e145ee..a57ce1f10fe 100644 --- a/board/sifive/unmatched/unmatched.c +++ b/board/sifive/unmatched/unmatched.c @@ -10,16 +10,6 @@ #include #include -int board_fdt_blob_setup(void **fdtp) -{ - if (gd->arch.firmware_fdt_addr) { - *fdtp = (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr; - return 0; - } - - return -EEXIST; -} - int board_init(void) { /* enable all cache ways */ From patchwork Thu Feb 27 14:47:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Zi X-Patchwork-Id: 2053078 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=IvalhlT5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Z3Z3h4JkTz1xrB for ; Fri, 28 Feb 2025 01:49:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52DBC811A7; Thu, 27 Feb 2025 15:49:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org 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; secure) header.d=disroot.org header.i=@disroot.org header.b="IvalhlT5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F4215811B3; Thu, 27 Feb 2025 15:49:00 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (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 DBC3E811A7 for ; Thu, 27 Feb 2025 15:48:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ziyao@disroot.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9C0ED259BB; Thu, 27 Feb 2025 15:48:56 +0100 (CET) Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id IofmeCL_CP4W; Thu, 27 Feb 2025 15:48:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1740667711; bh=bBOaoVUC8v8AVdyO3BwxWqoC55NW7z9whotRJaLCKTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IvalhlT5lS+QMRyctPuTrBpV+SL4Er5N+c7pkq9WMNadRAphvgXfYDewx/5J83cq/ CBiYQzooiSy86N3O2AqBBSjUul81+EOa0hl4KbHgO21s6tON1NTl4YDqfRvZGk6fbG +rHb/UWu/jL/8TXdzPtd76gzye4lhlffIObFkBt5WpAtoqn35m82Y7sHxrOH6tqYeG 3VDFvdq0Gdnbi7SouQXWsyM2bc0p0inEice7pDd+l3tQHerYmhiziOXqsFSxe+V45s +rW9QPapsC0DhycCJ/IsqXg/9vP+XerqmiaauCB/ksRU464HeHjR/fNp6tJX2Txiwv ePieueD2mCrRw== From: Yao Zi To: Rick Chen , Leo , Tom Rini , Bin Meng , Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Green Wan , Minda Chen , Simon Glass , Angelo Dureghello , Ilias Apalodimas , Heinrich Schuchardt Cc: u-boot@lists.denx.de, Yao Zi Subject: [PATCH 5/5] riscv: select OF_HAS_PRIOR_STAGE by default if SBI is enabled Date: Thu, 27 Feb 2025 14:47:33 +0000 Message-ID: <20250227144734.61458-6-ziyao@disroot.org> In-Reply-To: <20250227144734.61458-1-ziyao@disroot.org> References: <20250227144734.61458-1-ziyao@disroot.org> MIME-Version: 1.0 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 Availability of RISC-V SBI service implies a prior stage exists. As SBI firmware usually passes a FDT to the loaded program, let's select OF_HAS_PRIOR_STAGE if SBI is enabled. With previously added fallback version of board_fdt_blob_setup, S-Mode RISC-V ports use the SBI-provided FDT by default. This covers the most common usecase, where a SPL (probably the U-Boot one) selects proper devicetree, loads SBI and U-Boot then invokes SBI with the devicetree. Signed-off-by: Yao Zi Reviewed-by: Leo Yu-Chi Liang --- arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index b24623590f2..f7706788f92 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -410,6 +410,7 @@ config NR_CPUS config SBI bool default y if RISCV_SMODE || SPL_RISCV_SMODE + imply OF_HAS_PRIOR_STAGE choice prompt "SBI support"