pxe: Move common parsing coding into pxe_util

Both the syslinux and pxe commands use essentially the same code to parse
and run extlinux.conf files. Move this into a common function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Artem Lapkin <email2tema@gmail.com>
Tested-by: Artem Lapkin <email2tema@gmail.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index 6ecd15ceadac0dc06fbec3faaf5fd9d50f774985..f40ad2b161ec77204a6deae8a68817809b60ab5d 100644 (file)
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -1505,3 +1505,23 @@ void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp,
        ctx->userdata = userdata;
        ctx->allow_abs_path = allow_abs_path;
 }
+
+int pxe_process(struct pxe_context *ctx, ulong pxefile_addr_r, bool prompt)
+{
+       struct pxe_menu *cfg;
+
+       cfg = parse_pxefile(ctx, pxefile_addr_r);
+       if (!cfg) {
+               printf("Error parsing config file\n");
+               return 1;
+       }
+
+       if (prompt)
+               cfg->prompt = 1;
+
+       handle_pxe_menu(ctx, cfg);
+
+       destroy_pxe_menu(cfg);
+
+       return 0;
+}

diff --git a/cmd/pxe.c b/cmd/pxe.c
index 17fe364bed954849653e7b76937f4e8a2dc66eac..4fa51d2e0533a34b5b75798ff102696217a2ff67 100644 (file)
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -171,9 +171,9 @@ static int
 do_pxe_boot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        unsigned long pxefile_addr_r;
-       struct pxe_menu *cfg;
        char *pxefile_addr_str;
        struct pxe_context ctx;
+       int ret;
 
        pxe_setup_ctx(&ctx, cmdtp, do_get_tftp, NULL, false);
 
@@ -193,16 +193,9 @@ do_pxe_boot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
                return 1;
        }
 
-       cfg = parse_pxefile(&ctx, pxefile_addr_r);
-
-       if (!cfg) {
-               printf("Error parsing config file\n");
-               return 1;
-       }
-
-       handle_pxe_menu(&ctx, cfg);
-
-       destroy_pxe_menu(cfg);
+       ret = pxe_process(&ctx, pxefile_addr_r, false);
+       if (ret)
+               return CMD_RET_FAILURE;
 
        copy_filename(net_boot_file_name, "", sizeof(net_boot_file_name));
 

diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index b81255e155a8e185f76c0f08db0172610eec2e81..7ee14df79e511009e9b8bf7deb3250d9547671f2 100644 (file)
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -60,10 +60,10 @@ static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc,
 {
        unsigned long pxefile_addr_r;
        struct pxe_context ctx;
-       struct pxe_menu *cfg;
        char *pxefile_addr_str;
        char *filename;
        int prompt = 0;
+       int ret;
 
        if (argc > 1 && strstr(argv[1], "-p")) {
                prompt = 1;
@@ -113,19 +113,9 @@ static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc,
                return 1;
        }
 
-       cfg = parse_pxefile(&ctx, pxefile_addr_r);
-
-       if (!cfg) {
-               printf("Error parsing config file\n");
-               return 1;
-       }
-
-       if (prompt)
-               cfg->prompt = 1;
-
-       handle_pxe_menu(&ctx, cfg);
-
-       destroy_pxe_menu(cfg);
+       ret = pxe_process(&ctx, pxefile_addr_r, prompt);
+       if (ret)
+               return CMD_RET_FAILURE;
 
        return 0;
 }

diff --git a/include/pxe_utils.h b/include/pxe_utils.h
index 6681442ea559cdd1e3ec7ddd2b9d2cebe8cd5be4..0cae0dabec35068fbc6042b90e07c737ae989104 100644 (file)
--- a/include/pxe_utils.h
+++ b/include/pxe_utils.h
@@ -202,4 +202,13 @@ void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp,
                   pxe_getfile_func getfile, void *userdata,
                   bool allow_abs_path);
 
+/**
+ * pxe_process() - Process a PXE file through to boot
+ *
+ * @ctx: PXE context created with pxe_setup_ctx()
+ * @pxefile_addr_r: Address to load file
+ * @prompt: Force a prompt for the user
+ */
+int pxe_process(struct pxe_context *ctx, ulong pxefile_addr_r, bool prompt);
+
 #endif /* __PXE_UTILS_H */