From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 12 Jun 2023 14:52:12 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q8h1p-003q2X-PS for lore@lore.pengutronix.de; Mon, 12 Jun 2023 14:52:12 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q8h1m-0005qC-T6 for lore@pengutronix.de; Mon, 12 Jun 2023 14:52:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Mq9bt0BiX7l75VDFD92aU9BEd7fPuW+Th+LOEgGMt40=; b=yQBfkS5dTrSdygqb/fW8XzbSGi Ni/R27Wi9h2b11jfuZ0pEie8Paio8yVcX6bgFaijNrHDlfOv1aq4B4AgmliCCrJYAKmPiK+BirOOj Qo6rlb9QCLSdsdNEsuUXgqOEtGtPpe0D67sdohTV6I+NA7X4ZkE/PgaK0cGqT+qq8+TwWYkaWdNM9 ATPik3ETI8lxpg7IkR/+51983fMvekfefZT97FxOxULGFJgNApKJS3LLQlU8X4lyaBxiL+pqTkcwx xlMcsbKEP5M3oolb7cHB4sQxrV+ctUy6mVwTKffOuSLxwZ5qCr7D7jwKORIY8cB7u2H9btSEVlgWy uHhchHTg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q8h0p-0044Ja-36; Mon, 12 Jun 2023 12:51:11 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q8h0m-0044Hx-2u for barebox@lists.infradead.org; Mon, 12 Jun 2023 12:51:10 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q8h0l-0005RV-Mo; Mon, 12 Jun 2023 14:51:07 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q8h0k-006tSV-Vw; Mon, 12 Jun 2023 14:51:07 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q8h0j-004XjY-St; Mon, 12 Jun 2023 14:51:05 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 12 Jun 2023 14:51:04 +0200 Message-Id: <20230612125104.1082800-7-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612125104.1082800-1-a.fatoum@pengutronix.de> References: <20230612125104.1082800-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230612_055108_938887_9CCEEF94 X-CRM114-Status: GOOD ( 11.69 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v4 6/6] boards: qemu-virt: support older QEMU with /soc/flash X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) Qemu versions differ in whether the flash is top-level or under the /soc node. As we apply a state fixup to the Qemu-passed DT, we need to know where the flash at. Easiest way is just to move it for older Qemus to the new location. Signed-off-by: Ahmad Fatoum --- common/boards/qemu-virt/board.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/boards/qemu-virt/board.c b/common/boards/qemu-virt/board.c index 4c6df5e30252..06705dce394a 100644 --- a/common/boards/qemu-virt/board.c +++ b/common/boards/qemu-virt/board.c @@ -52,7 +52,7 @@ BAREBOX_DEEP_PROBE_ENABLE(virt_of_match); */ static int virt_board_driver_init(void) { - struct device_node *root = of_get_root_node(); + struct device_node *soc, *root = of_get_root_node(); struct device_node *overlay, *pubkey; const struct of_device_id *id; void (*init)(void); @@ -66,6 +66,11 @@ static int virt_board_driver_init(void) init(); } + /* Rename older QEMU's /soc/flash@X to /flash@X */ + soc = of_get_child_by_name(root, "soc"); + if (soc) + of_move_node(root, of_find_node_by_name(soc, "flash")); + overlay = of_unflatten_dtb(__dtbo_qemu_virt_flash_start, INT_MAX); of_overlay_apply_tree(root, overlay); -- 2.39.2