video/console: Fix DM_VIDEO font glyph array indexing

[oweals/u-boot.git] / fs / fs.c

diff --git a/fs/fs.c b/fs/fs.c
index 7fd22101efe657b72b48c472a4d9dd100c4aedc9..736ebef4a93917fc84590d2739a73cc9f2793138 100644 (file)
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -90,6 +90,11 @@ static inline int fs_write_unsupported(const char *filename, void *buf,
        return -1;
 }
 
+static inline int fs_ln_unsupported(const char *filename, const char *target)
+{
+       return -1;
+}
+
 static inline void fs_close_unsupported(void)
 {
 }
@@ -154,6 +159,7 @@ struct fstype_info {
        void (*closedir)(struct fs_dir_stream *dirs);
        int (*unlink)(const char *filename);
        int (*mkdir)(const char *dirname);
+       int (*ln)(const char *filename, const char *target);
 };
 
 static struct fstype_info fstypes[] = {
@@ -168,7 +174,7 @@ static struct fstype_info fstypes[] = {
                .exists = fat_exists,
                .size = fat_size,
                .read = fat_read_file,
-#ifdef CONFIG_FAT_WRITE
+#if CONFIG_IS_ENABLED(FAT_WRITE)
                .write = file_fat_write,
                .unlink = fat_unlink,
                .mkdir = fat_mkdir,
@@ -181,9 +187,11 @@ static struct fstype_info fstypes[] = {
                .opendir = fat_opendir,
                .readdir = fat_readdir,
                .closedir = fat_closedir,
+               .ln = fs_ln_unsupported,
        },
 #endif
-#ifdef CONFIG_FS_EXT4
+
+#if CONFIG_IS_ENABLED(FS_EXT4)
        {
                .fstype = FS_TYPE_EXT,
                .name = "ext4",
@@ -196,8 +204,10 @@ static struct fstype_info fstypes[] = {
                .read = ext4_read_file,
 #ifdef CONFIG_CMD_EXT4_WRITE
                .write = ext4_write_file,
+               .ln = ext4fs_create_link,
 #else
                .write = fs_write_unsupported,
+               .ln = fs_ln_unsupported,
 #endif
                .uuid = ext4fs_uuid,
                .opendir = fs_opendir_unsupported,
@@ -221,6 +231,7 @@ static struct fstype_info fstypes[] = {
                .opendir = fs_opendir_unsupported,
                .unlink = fs_unlink_unsupported,
                .mkdir = fs_mkdir_unsupported,
+               .ln = fs_ln_unsupported,
        },
 #endif
 #ifdef CONFIG_CMD_UBIFS
@@ -239,6 +250,7 @@ static struct fstype_info fstypes[] = {
                .opendir = fs_opendir_unsupported,
                .unlink = fs_unlink_unsupported,
                .mkdir = fs_mkdir_unsupported,
+               .ln = fs_ln_unsupported,
        },
 #endif
 #ifdef CONFIG_FS_BTRFS
@@ -257,6 +269,7 @@ static struct fstype_info fstypes[] = {
                .opendir = fs_opendir_unsupported,
                .unlink = fs_unlink_unsupported,
                .mkdir = fs_mkdir_unsupported,
+               .ln = fs_ln_unsupported,
        },
 #endif
        {
@@ -274,6 +287,7 @@ static struct fstype_info fstypes[] = {
                .opendir = fs_opendir_unsupported,
                .unlink = fs_unlink_unsupported,
                .mkdir = fs_mkdir_unsupported,
+               .ln = fs_ln_unsupported,
        },
 };
 
@@ -453,8 +467,7 @@ static int fs_read_lmb_check(const char *filename, ulong addr, loff_t offset,
        if (len && len < read_len)
                read_len = len;
 
-       lmb_init_and_reserve(&lmb, gd->bd->bi_dram[0].start,
-                            gd->bd->bi_dram[0].size, (void *)gd->fdt_blob);
+       lmb_init_and_reserve(&lmb, gd->bd, (void *)gd->fdt_blob);
        lmb_dump_all(&lmb);
 
        if (lmb_alloc_addr(&lmb, addr, read_len) == addr)
@@ -602,6 +615,22 @@ int fs_mkdir(const char *dirname)
        return ret;
 }
 
+int fs_ln(const char *fname, const char *target)
+{
+       struct fstype_info *info = fs_get_info(fs_type);
+       int ret;
+
+       ret = info->ln(fname, target);
+
+       if (ret < 0) {
+               printf("** Unable to create link %s -> %s **\n", fname, target);
+               ret = -1;
+       }
+       fs_close();
+
+       return ret;
+}
+
 int do_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
                int fstype)
 {
@@ -801,6 +830,8 @@ int do_fs_type(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        else
                printf("%s\n", info->name);
 
+       fs_close();
+
        return CMD_RET_SUCCESS;
 }
 
@@ -838,3 +869,18 @@ int do_mkdir(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
 
        return 0;
 }
+
+int do_ln(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
+         int fstype)
+{
+       if (argc != 5)
+               return CMD_RET_USAGE;
+
+       if (fs_set_blk_dev(argv[1], argv[2], fstype))
+               return 1;
+
+       if (fs_ln(argv[3], argv[4]))
+               return 1;
+
+       return 0;
+}