From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 18 Aug 2025 20:17:16 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uo4Q1-001yFH-0F for lore@lore.pengutronix.de; Mon, 18 Aug 2025 20:17:16 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uo4Pz-0000jQ-48 for lore@pengutronix.de; Mon, 18 Aug 2025 20:17:16 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4YWII6RWpxvmiHxaZwrEo/hbUgtV3E9+33XB1Jx2JNE=; b=wBCcHQQHk6PnMt5nUTAvgxtNol TVf2a8aPnB+hdUulkFiOBGtFtY66d4r8HxDhzgVDmojhaTenol+EwxFCibnBDxFBdxFC5Oh6dRDGn Bst+l1ha49FAIo/902Rvg0KrsSSpaS+hDYC+dSEKsh2HBuGgiwHsXAv4HBHw9aFbyuFNHP/BBlXF8 7yP2PvO4Hk88H/D7CYbAq5l9tfPGKu08QfJe1yEY5A8mz3SvVZ56lrsPeeuiB2x9+iZLrfWE6nMjQ 0KzAMSSDlfy7oj1EqexZNEx8Sa5G0d/ix2IoVUra+fDqLM4FswMdRkKqQD4GcYuJn/hG5KC684Xgr i2hxhNeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uo4PV-00000008Ijq-1u1w; Mon, 18 Aug 2025 18:16:45 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uo3cZ-000000087uB-2ikX for barebox@lists.infradead.org; Mon, 18 Aug 2025 17:26:13 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uo3cY-0008EV-BP; Mon, 18 Aug 2025 19:26:10 +0200 From: Marco Felsch Date: Mon, 18 Aug 2025 19:26:12 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250818-v2024-05-0-topic-fit-overlay-v5-4-b92e466a1d32@pengutronix.de> References: <20250818-v2024-05-0-topic-fit-overlay-v5-0-b92e466a1d32@pengutronix.de> In-Reply-To: <20250818-v2024-05-0-topic-fit-overlay-v5-0-b92e466a1d32@pengutronix.de> To: Sascha Hauer , BAREBOX Cc: Marco Felsch X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250818_102611_828323_7561BB2E X-CRM114-Status: GOOD ( 11.91 ) 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.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.1 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 v5 04/11] of: overlay: make search dir more generic X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Rename global.of.overlay.dir to global.of.overlay.path to prepare the codebase to handle FIT image overlays as well because *.path doesn't imply that it have to be a directory. Keep the backward compatibility by providing the of.overlay.dir variable but mark it as deprecated. Signed-off-by: Marco Felsch --- Documentation/user/devicetree.rst | 2 +- drivers/of/overlay.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Documentation/user/devicetree.rst b/Documentation/user/devicetree.rst index ef04e14f7c0dde579493425073f1ee01395f0d8c..30a15a8865c154f8afe23d641da10d0afa84423b 100644 --- a/Documentation/user/devicetree.rst +++ b/Documentation/user/devicetree.rst @@ -108,7 +108,7 @@ Device tree overlays on the kernel device tree Overlays can be applied to the kernel device tree before it is handed over to the kernel. The behaviour is controlled by different variables: -``global.of.overlay.dir`` +``global.of.overlay.path`` Overlays are read from this directory. barebox will try to apply all overlays found here if not limited by one of the other variables below. When the path given here is an absolute path it is used as is. A relative path is relative diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index a63cca1b47e74615d4453a27a55fb15d1f706fae..bc3fdff0cd277b3460981769c2b220adfced6e80 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -408,7 +408,7 @@ int of_register_overlay(struct device_node *overlay) } static char *of_overlay_pattern; -static char *of_overlay_dir; +static char *of_overlay_path; static char *of_overlay_basedir; /** @@ -468,13 +468,13 @@ static int of_overlay_global_fixup(struct device_node *root, void *data) char *dir; int ret; - if (*of_overlay_dir == '/') - return of_overlay_apply_dir(root, of_overlay_dir, true); + if (*of_overlay_path == '/') + return of_overlay_apply_dir(root, of_overlay_path, true); - if (*of_overlay_dir == '\0') + if (*of_overlay_path == '\0') return 0; - dir = concat_path_file(of_overlay_basedir, of_overlay_dir); + dir = concat_path_file(of_overlay_basedir, of_overlay_path); ret = of_overlay_apply_dir(root, dir, true); @@ -616,9 +616,10 @@ static int of_overlay_init(void) globalvar_add_simple_string("of.overlay.compatible", &of_overlay_compatible); globalvar_add_simple_string("of.overlay.pattern", &of_overlay_pattern); globalvar_add_simple_string("of.overlay.filter", &of_overlay_filter); - globalvar_add_simple_string("of.overlay.dir", &of_overlay_dir); + globalvar_add_simple_string("of.overlay.path", &of_overlay_path); globalvar_alias_deprecated("of.overlay.filepattern", "of.overlay.pattern"); + globalvar_alias_deprecated("of.overlay.dir", "of.overlay.path"); of_overlay_register_filter(&of_overlay_pattern_filter); of_overlay_register_filter(&of_overlay_filepattern_filter); @@ -632,5 +633,5 @@ device_initcall(of_overlay_init); BAREBOX_MAGICVAR(global.of.overlay.compatible, "space separated list of compatibles an overlay must match"); BAREBOX_MAGICVAR(global.of.overlay.pattern, "space separated list of filepatterns an overlay must match"); -BAREBOX_MAGICVAR(global.of.overlay.dir, "Directory to look for dt overlays"); +BAREBOX_MAGICVAR(global.of.overlay.path, "Path to look for dt overlays"); BAREBOX_MAGICVAR(global.of.overlay.filter, "space separated list of filters"); -- 2.39.5