From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 22 Mar 2024 17:50:38 +0100 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 1rni6I-0007Nr-0y for lore@lore.pengutronix.de; Fri, 22 Mar 2024 17:50:38 +0100 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 1rni6H-0002Rl-Kw for lore@pengutronix.de; Fri, 22 Mar 2024 17:50:38 +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=/ZQ1ViacHy9KROnx7hDAw5MXqBELZVdRoRIIrwIjTGg=; b=VLQ4UlvDbWTgrt6PYP31MOiML1 lamkko0J9oJms593ZOaStft/Gho65l3dsyo0XhB6oWkigffipRAveXW8Cq7ly5BBHKZw1+JZYvzfa XhPz5Wvq6Lt7y0+P/LHMQ2Xa2MsasgxDPfCpB2IudLqd/cISqAy1sHkLfvdLHsmfkdclOiIG8M7Qr 5HPlpaoKJEGSj8NEccBqxa5qwe1oiwDMeq4I/HQ1dzJ7/64yoPWnMmzweHb7ayU3s8ewLquPAJrEt atIz1iYm8MiWY9DX3O8QBwZMWplGQFt9PCY+jAmSvjZcGLgWyzd7Ol14UFk2i+pmpRd7hEaho+ohk wLIk7MSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rni5o-000000081Ev-1aIH; Fri, 22 Mar 2024 16:50:08 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rni5c-0000000816x-3fiB for barebox@lists.infradead.org; Fri, 22 Mar 2024 16:50:00 +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 1rni5b-0001y5-Ps for barebox@lists.infradead.org; Fri, 22 Mar 2024 17:49:55 +0100 From: Marco Felsch To: barebox@lists.infradead.org Date: Fri, 22 Mar 2024 17:49:49 +0100 Message-Id: <20240322164953.1772129-4-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322164953.1772129-1-m.felsch@pengutronix.de> References: <20240322164953.1772129-1-m.felsch@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-20240322_094957_021104_DC05AF0F X-CRM114-Status: GOOD ( 10.84 ) 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.2 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 4/8] of: overlay: make search dir/path 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) In preparation of adding support for FIT image overlay handling the global.of.overlay.dir can be reused if we rename it to a more generic global.of.overlay.path since it does not imply an directory. This commit adds the ground work by deprecating the old global.of.overlay.dir and moving the directory handling into a separate of_overlay_global_fixup_dir() helper. No functional change. Signed-off-by: Marco Felsch --- drivers/of/overlay.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index b688e708c382..e9fd5c0a1f7d 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -398,7 +398,7 @@ int of_register_overlay(struct device_node *overlay) static char *of_overlay_fitconfigpattern; static char *of_overlay_pattern; -static char *of_overlay_dir; +static char *of_overlay_path; static char *of_overlay_basedir; /** @@ -453,18 +453,18 @@ static int of_overlay_apply_dir(struct device_node *root, const char *dirname, return ret; } -static int of_overlay_global_fixup(struct device_node *root, void *data) +static int of_overlay_global_fixup_dir(struct device_node *root, const char *ovl_dir) { char *dir; int ret; - if (*of_overlay_dir == '/') - return of_overlay_apply_dir(root, of_overlay_dir, true); + if (*ovl_dir == '/') + return of_overlay_apply_dir(root, ovl_dir, true); - if (*of_overlay_dir == '\0') + if (*ovl_dir == '\0') return 0; - dir = concat_path_file(of_overlay_basedir, of_overlay_dir); + dir = concat_path_file(of_overlay_basedir, ovl_dir); ret = of_overlay_apply_dir(root, dir, true); @@ -473,6 +473,11 @@ static int of_overlay_global_fixup(struct device_node *root, void *data) return ret; } +static int of_overlay_global_fixup(struct device_node *root, void *data) +{ + return of_overlay_global_fixup_dir(root, of_overlay_path); +} + /** * of_overlay_register_filter - register a new overlay filter * @filter: The new filter @@ -607,10 +612,11 @@ 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_add_simple_string("of.overlay.fitconfigpattern", &of_overlay_fitconfigpattern); 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); @@ -624,6 +630,6 @@ 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"); BAREBOX_MAGICVAR(global.of.overlay.fitconfigpattern, "FIT config node name pattern to look for dt overlays"); -- 2.39.2