Hi,
On 10.03.21 14:28, Sascha Hauer wrote:
> We have a global firmware search path, so use it. This removes the
> path argument from of_firmware_load_overlay(). blspec already extends
> the global firmware search path, so the path is not needed there.
> The of_overlay command has an option for specifying the search path,
> this is simply ignored from now on in favour for the global search path.
>
> Signed-off-by: Sascha Hauer <[email protected]>
> ---
> commands/of_overlay.c | 13 +++++--------
> common/blspec.c | 11 +----------
> drivers/of/of_firmware.c | 25 ++++---------------------
> include/of.h | 4 ++--
> 4 files changed, 12 insertions(+), 41 deletions(-)
>
> diff --git a/commands/of_overlay.c b/commands/of_overlay.c
> index 9a4c008efc..9b1cc6e8c7 100644
> --- a/commands/of_overlay.c
> +++ b/commands/of_overlay.c
> @@ -16,13 +16,12 @@ static int do_of_overlay(int argc, char *argv[])
> int opt, ret;
> struct fdt_header *fdt;
> struct device_node *overlay;
> - const char *search_path = NULL;
> size_t size;
>
> while ((opt = getopt(argc, argv, "S:")) > 0) {
> switch (opt) {
> case 'S':
> - search_path = optarg;
> + /* Ignore for compatibility */
If you really want to maintain compatibility, why don't do a setenv?
Keeping the flag, but ignoring the argument sounds very surprising.
> break;
> default:
> return COMMAND_ERROR_USAGE;
> @@ -43,11 +42,9 @@ static int do_of_overlay(int argc, char *argv[])
> if (IS_ERR(overlay))
> return PTR_ERR(overlay);
>
> - if (search_path) {
> - ret = of_firmware_load_overlay(overlay, search_path);
> - if (ret)
> - goto err;
> - }
> + ret = of_firmware_load_overlay(overlay);
> + if (ret)
> + goto err;
>
> ret = of_register_overlay(overlay);
> if (ret) {
> @@ -64,7 +61,7 @@ err:
>
> BAREBOX_CMD_HELP_START(of_overlay)
> BAREBOX_CMD_HELP_TEXT("Options:")
> -BAREBOX_CMD_HELP_OPT("-S path", "load firmware using this search path")
> +BAREBOX_CMD_HELP_OPT("-S path", "ignored")
> BAREBOX_CMD_HELP_END
>
> BAREBOX_CMD_START(of_overlay)
> diff --git a/common/blspec.c b/common/blspec.c
> index 14e3238c0f..d771176a45 100644
> --- a/common/blspec.c
> +++ b/common/blspec.c
> @@ -39,7 +39,6 @@ static int blspec_apply_oftree_overlay(char *file, const
> char *abspath,
> struct fdt_header *fdt;
> struct device_node *overlay;
> char *path;
> - char *firmware_path;
> size_t size;
>
> path = basprintf("%s/%s", abspath, file);
> @@ -64,15 +63,7 @@ static int blspec_apply_oftree_overlay(char *file, const
> char *abspath,
> goto out;
> }
>
> - /*
> - * Unfortunately the device tree overlay contains only the filename of
> - * the firmware and relies on the firmware search paths to find the
> - * actual file. Use /lib/firmware in the Linux root directory and hope
> - * for the best.
> - */
> - firmware_path = basprintf("%s/%s", abspath, "/lib/firmware");
> - ret = of_firmware_load_overlay(overlay, firmware_path);
> - free(firmware_path);
> + ret = of_firmware_load_overlay(overlay);
> if (ret) {
> pr_warn("failed to load firmware: skip overlay \"%s\"\n", path);
> of_delete_node(overlay);
> diff --git a/drivers/of/of_firmware.c b/drivers/of/of_firmware.c
> index 096f84572e..12ce1d95d0 100644
> --- a/drivers/of/of_firmware.c
> +++ b/drivers/of/of_firmware.c
> @@ -6,10 +6,6 @@
> #include <firmware.h>
> #include <of.h>
>
> -struct overlay_info {
> - const char *firmware_path;
> -};
> -
> static struct firmware_mgr *of_node_get_mgr(struct device_node *np)
> {
> struct device_node *mgr_node;
> @@ -26,12 +22,9 @@ static struct firmware_mgr *of_node_get_mgr(struct
> device_node *np)
> }
>
> static int load_firmware(struct device_node *target,
> - struct device_node *fragment, void *data)
> + struct device_node *fragment, void *unused)
> {
> - struct overlay_info *info = data;
> const char *firmware_name;
> - const char *firmware_path = info->firmware_path;
> - char *firmware;
> int err;
> struct firmware_mgr *mgr;
>
> @@ -50,22 +43,13 @@ static int load_firmware(struct device_node *target,
> if (!mgr)
> return -EINVAL;
>
> - firmware = basprintf("%s/%s", firmware_path, firmware_name);
> - if (!firmware)
> - return -ENOMEM;
> -
> - err = firmwaremgr_load_file(mgr, firmware);
> -
> - free(firmware);
> + err = firmwaremgr_load_file(mgr, firmware_name);
>
> return err;
> }
>
> -int of_firmware_load_overlay(struct device_node *overlay, const char *path)
> +int of_firmware_load_overlay(struct device_node *overlay)
> {
> - struct overlay_info info = {
> - .firmware_path = path,
> - };
> int err;
> struct device_node *root;
> struct device_node *resolved;
> @@ -81,8 +65,7 @@ int of_firmware_load_overlay(struct device_node *overlay,
> const char *path)
> */
> ovl = resolved ? resolved : overlay;
>
> - err = of_process_overlay(root, ovl,
> - load_firmware, &info);
> + err = of_process_overlay(root, ovl, load_firmware, NULL);
>
> if (resolved)
> of_delete_node(resolved);
> diff --git a/include/of.h b/include/of.h
> index e43e225338..56291b9801 100644
> --- a/include/of.h
> +++ b/include/of.h
> @@ -1033,7 +1033,7 @@ int of_process_overlay(struct device_node *root,
> struct device_node *overlay, void *data),
> void *data);
>
> -int of_firmware_load_overlay(struct device_node *overlay, const char *path);
> +int of_firmware_load_overlay(struct device_node *overlay);
> #else
> static inline struct device_node *of_resolve_phandles(struct device_node
> *root,
> const struct device_node *overlay)
> @@ -1067,7 +1067,7 @@ static inline int of_process_overlay(struct device_node
> *root,
> return -ENOSYS;
> }
>
> -static inline int of_firmware_load_overlay(struct device_node *overlay,
> const char *path)
> +static inline int of_firmware_load_overlay(struct device_node *overlay)
> {
> return -ENOSYS;
> }
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
