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 <m.fel...@pengutronix.de>
---
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
