ARM: zynq: Do not select options if SPL is not enabled

[oweals/u-boot.git] / common / spl / spl_fat.c

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 91481fcc134a9de791c15dc6d773943ba1064ec1..0daadbedae7a01971a7a93ad762db538d5d140d6 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -13,6 +13,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <fat.h>
+#include <errno.h>
 #include <image.h>
 
 static int fat_registered;
@@ -30,7 +31,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;
@@ -119,5 +120,10 @@ defaults:
        return spl_load_image_fat(block_dev, partition,
                        CONFIG_SPL_FS_LOAD_KERNEL_NAME);
 }
+#else
+int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition)
+{
+       return -ENOSYS;
+}
 #endif
 #endif