From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 08 Mar 2023 15:26:53 +0100 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 1pZukm-00DfYN-3H for lore@lore.pengutronix.de; Wed, 08 Mar 2023 15:26:53 +0100 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 1pZukl-0003bY-QM for lore@pengutronix.de; Wed, 08 Mar 2023 15:26:52 +0100 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:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0JKJ44K/4XgQx8TIOQi5ySwtksN3jTJFvYoY/MaNFeA=; b=Ms4u+DXGiCXpKNckEql2sQi9kA XLtlFCA7c2PkHBHBNpyekUrYMWKNWZrYKT5x1zMQhGNkZ1juBDQlI+gHrokdf6bNmTwtU95G/ao2n xXg3FCpOQz8jA3T/QpV0eq0XMqtpKYXNkKgfATHpsAsecv9I+44HSRRsKnwEbIL0lqmNj9wz8HNhC VexA3khISm2Efb4RDULR3gIz+RcsK2V6qOZuchGb5WI8FGDcMCUZc1XIrdrMwCH5L69YGwqfVU2Jp 0Q72k7cnVZyLJr2DYE3uqpppyf0XOlj61qTZNwnBw5uAt/bpQrzdkYYl+jyPXrGHbUS1hwmhYaK4m uv6NNKCg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZujX-005Qrz-6C; Wed, 08 Mar 2023 14:25:35 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZujF-005Qky-2f for barebox@lists.infradead.org; Wed, 08 Mar 2023 14:25:20 +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 1pZuj6-0002wp-8Y; Wed, 08 Mar 2023 15:25:08 +0100 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pZuQO-002jGG-B0; Wed, 08 Mar 2023 15:05:48 +0100 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pZuQM-00E7mO-Ie; Wed, 08 Mar 2023 15:05:46 +0100 From: Sascha Hauer To: Barebox List Date: Wed, 8 Mar 2023 15:05:45 +0100 Message-Id: <20230308140545.3366052-8-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230308140545.3366052-1-s.hauer@pengutronix.de> References: <20230308140545.3366052-1-s.hauer@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-20230308_062517_310580_620FD9B4 X-CRM114-Status: GOOD ( 16.19 ) 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 autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 7/7] of_overlay: Add option to apply overlay to live tree 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) The of_overlay command currently only supports applying overlays to the Linux device tree. Add an option to apply an overlay to the live tree. Using this option will apply the overlay and also triggers rescanning the device tree in case new devices have been added. Signed-off-by: Sascha Hauer --- commands/of_overlay.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/commands/of_overlay.c b/commands/of_overlay.c index b3660b4bf1..1d68e31ef2 100644 --- a/commands/of_overlay.c +++ b/commands/of_overlay.c @@ -17,10 +17,20 @@ static int do_of_overlay(int argc, char *argv[]) struct fdt_header *fdt; struct device_node *overlay; size_t size; + bool live_tree = false; + int opt; - if (argc != 2) + if (argc < 2) return COMMAND_ERROR_USAGE; + while ((opt = getopt(argc, argv, "l")) > 0) { + switch (opt) { + case 'l': + live_tree = true; + break; + } + } + fdt = read_file(argv[optind], &size); if (!fdt) { printf("cannot read %s\n", argv[optind]); @@ -32,7 +42,14 @@ static int do_of_overlay(int argc, char *argv[]) if (IS_ERR(overlay)) return PTR_ERR(overlay); - ret = of_register_overlay(overlay); + if (live_tree) { + ret = of_overlay_apply_tree(of_get_root_node(), overlay); + if (!ret) + ret = of_probe(); + } else { + ret = of_register_overlay(overlay); + } + if (ret) { printf("cannot apply oftree overlay: %s\n", strerror(-ret)); goto err; @@ -45,9 +62,22 @@ err: return ret; } +BAREBOX_CMD_HELP_START(of_overlay) +BAREBOX_CMD_HELP_TEXT("Register a device tree overlay file (dtbo) with barebox.") +BAREBOX_CMD_HELP_TEXT("By default the overlay is registered as a fixup and the") +BAREBOX_CMD_HELP_TEXT("overlay will then be applied to the Linux device tree.") +BAREBOX_CMD_HELP_TEXT("With -l given the overlay is applied to the barebox live") +BAREBOX_CMD_HELP_TEXT("tree instead. This involves probing new devices added in") +BAREBOX_CMD_HELP_TEXT("the overlay file.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-l", "apply to barebox live tree") +BAREBOX_CMD_HELP_END + BAREBOX_CMD_START(of_overlay) .cmd = do_of_overlay, - BAREBOX_CMD_DESC("register device tree overlay as fixup") - BAREBOX_CMD_OPTS("FILE") + BAREBOX_CMD_DESC("register device tree overlay") + BAREBOX_CMD_OPTS("[-l] FILE") BAREBOX_CMD_GROUP(CMD_GRP_MISC) + BAREBOX_CMD_HELP(cmd_of_overlay_help) BAREBOX_CMD_END -- 2.30.2