diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-24 10:52:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-25 09:27:07 +0200 |
| commit | 04e3a8fe4ae82bacd532e4fe91ec7a79260043e1 (patch) | |
| tree | a67a7453e7179baab446134c964011b9b6ad7a00 /commands | |
| parent | 9d43ef0db1ff83f673b7f7a3bc3a0e9c564365b1 (diff) | |
| download | barebox-04e3a8fe4ae82bacd532e4fe91ec7a79260043e1.tar.gz barebox-04e3a8fe4ae82bacd532e4fe91ec7a79260043e1.tar.xz | |
firmware: Load from global search path
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 removed here, the global search path has to be used instead.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.barebox.org/20210624085223.14616-13-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/of_overlay.c | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/commands/of_overlay.c b/commands/of_overlay.c index 9a4c008efc..71f41a3c04 100644 --- a/commands/of_overlay.c +++ b/commands/of_overlay.c @@ -13,23 +13,12 @@ static int do_of_overlay(int argc, char *argv[]) { - int opt, ret; + int 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; - break; - default: - return COMMAND_ERROR_USAGE; - } - } - - if (argc != optind + 1) + if (argc != 2) return COMMAND_ERROR_USAGE; fdt = read_file(argv[optind], &size); @@ -43,11 +32,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) { @@ -62,15 +49,9 @@ err: return ret; } -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_END - BAREBOX_CMD_START(of_overlay) .cmd = do_of_overlay, BAREBOX_CMD_DESC("register device tree overlay as fixup") - BAREBOX_CMD_OPTS("[-S path] FILE") + BAREBOX_CMD_OPTS("FILE") BAREBOX_CMD_GROUP(CMD_GRP_MISC) - BAREBOX_CMD_HELP(cmd_of_overlay_help) BAREBOX_CMD_END |