These IS_ENABLED(CONFIG_SPL_LOAD_FIT) cases can no longer be reached,
and thus get_fit_image_size() is also redundant.

Signed-off-by: Rasmus Villemoes <rasmus.villem...@prevas.dk>
---
 arch/arm/mach-imx/spl_imx_romapi.c | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/arch/arm/mach-imx/spl_imx_romapi.c 
b/arch/arm/mach-imx/spl_imx_romapi.c
index e4e2297ac0..d34102990f 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -177,23 +177,6 @@ static ulong spl_ram_load_read(struct spl_load_info *load, 
ulong sector,
        return count;
 }
 
-static ulong get_fit_image_size(void *fit)
-{
-       struct spl_image_info spl_image;
-       struct spl_load_info spl_load_info;
-       ulong last = (ulong)fit;
-
-       memset(&spl_load_info, 0, sizeof(spl_load_info));
-       spl_load_info.bl_len = 1;
-       spl_load_info.read = spl_ram_load_read;
-       spl_load_info.priv = &last;
-
-       spl_load_simple_fit(&spl_image, &spl_load_info,
-                           (uintptr_t)fit, fit);
-
-       return last - (ulong)fit;
-}
-
 static u8 *search_fit_header(u8 *p, int size)
 {
        int i;
@@ -254,9 +237,7 @@ static int img_info_size(void *img_hdr)
 
 static int img_total_size(void *img_hdr)
 {
-       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) {
-               return get_fit_image_size(img_hdr);
-       } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
+       if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
                int total = get_container_size((ulong)img_hdr, NULL);
 
                if (total < 0) {
@@ -379,9 +360,7 @@ static int spl_romapi_load_image_stream(struct 
spl_image_info *spl_image,
        load.bl_len = 1;
        load.read = spl_ram_load_read;
 
-       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT))
-               return spl_load_simple_fit(spl_image, &load, (ulong)phdr, phdr);
-       else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER))
+       if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER))
                return spl_load_imx_container(spl_image, &load, (ulong)phdr);
 
        return -1;
-- 
2.37.2

Reply via email to