spl: ext, fat: cleanup use of CONFIG_SPL_LIBCOMMON_SUPPORT
Minor cleanup of spl_ext and spl_fat files, removing the outdated
CONFIG_SPL_LIBCOMMON_SUPPORT symbols similar to the commit 1847129025
("spl: mmc: Drop checks for CONFIG_SPL_LIBCOMMON_SUPPORT") and adding a
few extra failure reports.
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Anshul Dalal <anshuld@ti.com>
This commit is contained in:
@@ -47,9 +47,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image,
|
||||
|
||||
err = ext4fs_mount();
|
||||
if (!err) {
|
||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
printf("%s: ext4fs mount err - %d\n", __func__, err);
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -63,11 +61,9 @@ int spl_load_image_ext(struct spl_image_info *spl_image,
|
||||
err = spl_load(spl_image, bootdev, &load, filelen, 0);
|
||||
|
||||
end:
|
||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
if (err < 0)
|
||||
printf("%s: error reading image %s, err - %d\n",
|
||||
__func__, filename, err);
|
||||
#endif
|
||||
|
||||
return err < 0;
|
||||
}
|
||||
@@ -91,9 +87,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image,
|
||||
|
||||
err = ext4fs_mount();
|
||||
if (!err) {
|
||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
printf("%s: ext4fs mount err - %d\n", __func__, err);
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -149,10 +143,8 @@ defaults:
|
||||
|
||||
err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen);
|
||||
if (err < 0) {
|
||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
printf("%s: error reading image %s, err - %d\n",
|
||||
__func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -34,9 +34,7 @@ static int spl_register_fat_device(struct blk_desc *block_dev, int partition)
|
||||
|
||||
err = fat_register_device(block_dev, partition);
|
||||
if (err) {
|
||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
printf("%s: fat register err - %d\n", __func__, err);
|
||||
#endif
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -98,11 +96,9 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
|
||||
err = spl_load(spl_image, bootdev, &load, size, 0);
|
||||
|
||||
end:
|
||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
if (err < 0)
|
||||
printf("%s: error reading image %s, err - %d\n",
|
||||
__func__, filename, err);
|
||||
#endif
|
||||
|
||||
return err;
|
||||
}
|
||||
@@ -157,10 +153,8 @@ defaults:
|
||||
err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME,
|
||||
(void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0);
|
||||
if (err <= 0) {
|
||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
printf("%s: error reading image %s, err - %d\n",
|
||||
__func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user