From patchwork Fri Oct 19 22:07:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 987082 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42cL8Q2Vm2z9sj7 for ; Sat, 20 Oct 2018 09:25:26 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1C4A9C21E07; Fri, 19 Oct 2018 22:16:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 78A62C21C6A; Fri, 19 Oct 2018 22:13:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7B281C21E1B; Fri, 19 Oct 2018 22:11:13 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id 05F0EC21DEC for ; Fri, 19 Oct 2018 22:11:13 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2EeAACcVcpb/xwBYJlkGgEBAQEBAgEBAQEHAgEBAQGBVAIBAQEBCwGBWiqBUzqMbIs7mTCBZg2EbAKFCSE3Cg0BAwEBAgEBAgICaSiFPAZ0BRBRPRoGDgWDIYIBAah/hTuEXwkBhyKEI4FYP4ERh3lkhQ0CiG2VVAcCgQ2BAQSOTwsXiSuGfoJjk2+BWSOBVTMaJIM7giYXfQECjRxtAYwkAQE X-IPAS-Result: A2EeAACcVcpb/xwBYJlkGgEBAQEBAgEBAQEHAgEBAQGBVAIBAQEBCwGBWiqBUzqMbIs7mTCBZg2EbAKFCSE3Cg0BAwEBAgEBAgICaSiFPAZ0BRBRPRoGDgWDIYIBAah/hTuEXwkBhyKEI4FYP4ERh3lkhQ0CiG2VVAcCgQ2BAQSOTwsXiSuGfoJjk2+BWSOBVTMaJIM7giYXfQECjRxtAYwkAQE X-IronPort-AV: E=Sophos;i="5.54,401,1534802400"; d="scan'208";a="7272592" Received: from mail-mtaka28.fraunhofer.de ([153.96.1.28]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Oct 2018 00:11:12 +0200 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CjAAAHVspb/xBhWMBkHAEBAQQBAQcEAQGBVAQBAQsBgVqCN4xspGuBZg2EbAKFKTcKDQEDAQECAQECbSiFOwZ0BRBRPRoGDgWDIYICqHuFO4RgCQGHIoV7P4ERh3lkhQ0CiG2VVAcCgQ2BAQSOTwsXiSuGfoJjk2+BWSKBVTMaJIM7giYXfQECjRw9MAGMJAEB X-IronPort-AV: E=Sophos;i="5.54,401,1534802400"; d="scan'208";a="18910117" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP11EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA28.fraunhofer.de with ESMTP/TLS/AES256-SHA; 20 Oct 2018 00:10:57 +0200 Received: from localhost.de (10.80.233.50) by FGDEMUCIMP11EXC.ads.fraunhofer.de (10.80.232.42) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sat, 20 Oct 2018 00:12:16 +0200 From: Lukas Auer To: Date: Sat, 20 Oct 2018 00:07:38 +0200 Message-ID: <20181019220743.15020-26-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181019220743.15020-1-lukas.auer@aisec.fraunhofer.de> References: <20181019220743.15020-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24166.002 X-TM-AS-Result: No--2.225200-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Subject: [U-Boot] [PATCH 25/30] riscv: qemu: use device tree passed by prior boot stage X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" QEMU provides a device tree, which is passed to u-boot using register a1. We are now able to directly select the device tree with the configuration CONFIG_OF_PRIOR_STAGE. Replace the hard-coded address in qemu-riscv with it. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Reviewed-by: Rick Chen --- board/emulation/qemu-riscv/qemu-riscv.c | 11 ----------- configs/qemu-riscv32_defconfig | 2 +- configs/qemu-riscv64_defconfig | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c index 041e716c9b..a7dc1d847e 100644 --- a/board/emulation/qemu-riscv/qemu-riscv.c +++ b/board/emulation/qemu-riscv/qemu-riscv.c @@ -6,18 +6,7 @@ #include #include -#define MROM_FDT_ADDR 0x1020 - int board_init(void) { return 0; } - -void *board_fdt_blob_setup(void) -{ - /* - * QEMU loads a generated DTB for us immediately - * after the reset vectors in the MROM - */ - return (void *)MROM_FDT_ADDR; -} diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig index ff1fb1f30e..72c54a3dd5 100644 --- a/configs/qemu-riscv32_defconfig +++ b/configs/qemu-riscv32_defconfig @@ -3,4 +3,4 @@ CONFIG_TARGET_QEMU_VIRT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y -CONFIG_OF_BOARD=y +CONFIG_OF_PRIOR_STAGE=y diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig index 60b647efe8..44766c38f6 100644 --- a/configs/qemu-riscv64_defconfig +++ b/configs/qemu-riscv64_defconfig @@ -4,4 +4,4 @@ CONFIG_ARCH_RV64I=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y -CONFIG_OF_BOARD=y +CONFIG_OF_PRIOR_STAGE=y