JFFS2: Speed up and fix comparison functions

[karo-tx-uboot.git] / common / spl / spl_fat.c

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 56be94388149856ebd40f7daf0ad1eb95d238a1e..350f7d9fd684f610c223f1dc8a58658b43b7f7eb 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -30,7 +30,7 @@ static int spl_register_fat_device(block_dev_desc_t *block_dev, int partition)
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("%s: fat register err - %d\n", __func__, err);
 #endif
-               hang();
+               return err;
        }
 
        fat_registered = 1;
@@ -106,18 +106,18 @@ int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition)
 defaults:
 #endif
 
-       err = file_fat_read(CONFIG_SPL_FAT_LOAD_ARGS_NAME,
+       err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME,
                            (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
        if (err <= 0) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("%s: error reading image %s, err - %d\n",
-                      __func__, CONFIG_SPL_FAT_LOAD_ARGS_NAME, err);
+                      __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
 #endif
                return -1;
        }
 
        return spl_load_image_fat(block_dev, partition,
-                       CONFIG_SPL_FAT_LOAD_KERNEL_NAME);
+                       CONFIG_SPL_FS_LOAD_KERNEL_NAME);
 }
 #endif
 #endif