summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorGuillaume GARDET <guillaume.gardet@free.fr>2014-10-15 17:53:14 +0200
committerTom Rini <trini@ti.com>2014-10-27 17:54:08 -0400
commit7d2b4e772998d8efb7266a33d93bccc1afe70462 (patch)
treed5fb1fd8495dd931752a0170457991a946987e10 /common
parentfae81c72c80636be657a24d42eb80971cb0e5793 (diff)
downloadtalos-obmc-uboot-7d2b4e772998d8efb7266a33d93bccc1afe70462.tar.gz
talos-obmc-uboot-7d2b4e772998d8efb7266a33d93bccc1afe70462.zip
spl: do not hang in spl_register_fat_device but return error value. It allows to use both CONFIG_SPL_FAT_SUPPORT and CONFIG_SPL_EXT_SUPPORT.
Do not hang in spl_register_fat_device but return an error value. It allows to use both CONFIG_SPL_FAT_SUPPORT and CONFIG_SPL_EXT_SUPPORT. If FAT load fails, then EXT load is tried. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl_fat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 91481fcc13..350f7d9fd6 100644
--- 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;
OpenPOWER on IntegriCloud