@ -54,9 +54,9 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
return actread ;
}
int spl_load_image_fat ( struct blk_desc * block_dev ,
int partition ,
const char * filename )
int spl_load_image_fat ( struct spl_image_info * spl_image ,
struct blk_desc * block_dev , int partition ,
const char * filename )
{
int err ;
struct image_header * header ;
@ -84,12 +84,12 @@ int spl_load_image_fat(struct blk_desc *block_dev,
return spl_load_simple_fit ( & load , 0 , header ) ;
} else {
err = spl_parse_image_header ( & spl_image , header ) ;
err = spl_parse_image_header ( spl_image , header ) ;
if ( err )
goto end ;
err = file_fat_read ( filename ,
( u8 * ) ( uintptr_t ) spl_image . load_addr , 0 ) ;
( u8 * ) ( uintptr_t ) spl_image - > load_addr , 0 ) ;
}
end :
@ -103,7 +103,8 @@ end:
}
# ifdef CONFIG_SPL_OS_BOOT
int spl_load_image_fat_os ( struct blk_desc * block_dev , int partition )
int spl_load_image_fat_os ( struct spl_image_info * spl_image ,
struct blk_desc * block_dev , int partition )
{
int err ;
__maybe_unused char * file ;
@ -123,7 +124,8 @@ int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
}
file = getenv ( " falcon_image_file " ) ;
if ( file ) {
err = spl_load_image_fat ( block_dev , partition , file ) ;
err = spl_load_image_fat ( spl_image , block_dev ,
partition , file ) ;
if ( err ! = 0 ) {
puts ( " spl: falling back to default \n " ) ;
goto defaults ;
@ -148,11 +150,12 @@ defaults:
return - 1 ;
}
return spl_load_image_fat ( block_dev , partition ,
return spl_load_image_fat ( spl_image , block_dev , partition ,
CONFIG_SPL_FS_LOAD_KERNEL_NAME ) ;
}
# else
int spl_load_image_fat_os ( struct blk_desc * block_dev , int partition )
int spl_load_image_fat_os ( struct spl_image_info * spl_image ,
struct blk_desc * block_dev , int partition )
{
return - ENOSYS ;
}