From: Guillaume GARDET Date: Wed, 15 Oct 2014 15:53:14 +0000 (+0200) Subject: spl: do not hang in spl_register_fat_device but return error value. It allows to... X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=7d2b4e772998d8efb7266a33d93bccc1afe70462;p=u-boot.git 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 Cc: Tom Rini --- 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;