Merge tag 'efi-2022-07-rc4-4' of https://source.denx.de/u-boot/custodians/u-boot-efi

[platform/kernel/u-boot.git] / cmd / fs.c

diff --git a/cmd/fs.c b/cmd/fs.c
index 8064a1c..5ad1164 100644 (file)
--- a/cmd/fs.c
+++ b/cmd/fs.c
@@ -8,9 +8,9 @@
 #include <common.h>
 #include <command.h>
 #include <fs.h>
-#include <efi_loader.h>
 
-static int do_size_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_size_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
+                          char *const argv[])
 {
        return do_size(cmdtp, flag, argc, argv, FS_TYPE_ANY);
 }
@@ -23,11 +23,9 @@ U_BOOT_CMD(
        "      and determine its size."
 );
 
-static int do_load_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
+static int do_load_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
+                          char *const argv[])
 {
-       efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "",
-                       (argc > 4) ? argv[4] : "");
        return do_load(cmdtp, flag, argc, argv, FS_TYPE_ANY);
 }
 
@@ -43,8 +41,8 @@ U_BOOT_CMD(
        "      If 'pos' is 0 or omitted, the file is read from the start."
 )
 
-static int do_save_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
+static int do_save_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
+                          char *const argv[])
 {
        return do_save(cmdtp, flag, argc, argv, FS_TYPE_ANY);
 }
@@ -60,8 +58,8 @@ U_BOOT_CMD(
        "      If 'pos' is 0 or omitted, the file is written from the start."
 )
 
-static int do_ls_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
+static int do_ls_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
 {
        return do_ls(cmdtp, flag, argc, argv, FS_TYPE_ANY);
 }
@@ -74,8 +72,22 @@ U_BOOT_CMD(
        "      device type 'interface' instance 'dev'."
 )
 
-static int do_fstype_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
+static int do_ln_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
+{
+       return do_ln(cmdtp, flag, argc, argv, FS_TYPE_ANY);
+}
+
+U_BOOT_CMD(
+       ln,     5,      1,      do_ln_wrapper,
+       "Create a symbolic link",
+       "<interface> <dev[:part]> target linkname\n"
+       "    - create a symbolic link to 'target' with the name 'linkname' on\n"
+       "      device type 'interface' instance 'dev'."
+)
+
+static int do_fstype_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
+                            char *const argv[])
 {
        return do_fs_type(cmdtp, flag, argc, argv);
 }
@@ -88,3 +100,14 @@ U_BOOT_CMD(
        "fstype <interface> <dev>:<part> <varname>\n"
        "- set environment variable to filesystem type\n"
 );
+
+static int do_fstypes_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
+                             char * const argv[])
+{
+       return do_fs_types(cmdtp, flag, argc, argv);
+}
+
+U_BOOT_CMD(
+       fstypes, 1, 1, do_fstypes_wrapper,
+       "List supported filesystem types", ""
+);