@ -29,7 +29,7 @@
# include <image.h>
# include <image.h>
# include <mapmem.h>
# include <mapmem.h>
# if defined(CONF IG_FIT) || defined(CONFIG_OF_LIBFDT)
# if IMA GE_ENABLE _FIT || defined(CONFIG_OF_LIBFDT)
# include <libfdt.h>
# include <libfdt.h>
# include <fdt_support.h>
# include <fdt_support.h>
# endif
# endif
@ -707,7 +707,7 @@ ulong genimg_get_kernel_addr_fit(char * const img_addr,
kernel_addr = load_addr ;
kernel_addr = load_addr ;
debug ( " * kernel: default image load address = 0x%08lx \n " ,
debug ( " * kernel: default image load address = 0x%08lx \n " ,
load_addr ) ;
load_addr ) ;
# if defined( CONFIG_FIT)
# if CONFIG_IS_ENABLED( FIT)
} else if ( fit_parse_conf ( img_addr , load_addr , & kernel_addr ,
} else if ( fit_parse_conf ( img_addr , load_addr , & kernel_addr ,
fit_uname_config ) ) {
fit_uname_config ) ) {
debug ( " * kernel: config '%s' from image at 0x%08lx \n " ,
debug ( " * kernel: config '%s' from image at 0x%08lx \n " ,
@ -762,7 +762,7 @@ int genimg_get_format(const void *img_addr)
if ( image_check_magic ( hdr ) )
if ( image_check_magic ( hdr ) )
return IMAGE_FORMAT_LEGACY ;
return IMAGE_FORMAT_LEGACY ;
# endif
# endif
# if defined(CONF IG_FIT) || defined(CONFIG_OF_LIBFDT)
# if IMA GE_ENABLE _FIT || defined(CONFIG_OF_LIBFDT)
if ( fdt_check_header ( img_addr ) = = 0 )
if ( fdt_check_header ( img_addr ) = = 0 )
return IMAGE_FORMAT_FIT ;
return IMAGE_FORMAT_FIT ;
# endif
# endif
@ -799,7 +799,7 @@ ulong genimg_get_image(ulong img_addr)
/* get header size */
/* get header size */
h_size = image_get_header_size ( ) ;
h_size = image_get_header_size ( ) ;
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
if ( sizeof ( struct fdt_header ) > h_size )
if ( sizeof ( struct fdt_header ) > h_size )
h_size = sizeof ( struct fdt_header ) ;
h_size = sizeof ( struct fdt_header ) ;
# endif
# endif
@ -821,7 +821,7 @@ ulong genimg_get_image(ulong img_addr)
ram_addr , d_size ) ;
ram_addr , d_size ) ;
break ;
break ;
# endif
# endif
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
case IMAGE_FORMAT_FIT :
case IMAGE_FORMAT_FIT :
d_size = fit_get_size ( buf ) - h_size ;
d_size = fit_get_size ( buf ) - h_size ;
debug ( " FIT/FDT format image found at 0x%08lx, "
debug ( " FIT/FDT format image found at 0x%08lx, "
@ -862,7 +862,7 @@ ulong genimg_get_image(ulong img_addr)
*/
*/
int genimg_has_config ( bootm_headers_t * images )
int genimg_has_config ( bootm_headers_t * images )
{
{
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
if ( images - > fit_uname_cfg )
if ( images - > fit_uname_cfg )
return 1 ;
return 1 ;
# endif
# endif
@ -903,7 +903,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
# ifdef CONFIG_SUPPORT_RAW_INITRD
# ifdef CONFIG_SUPPORT_RAW_INITRD
char * end ;
char * end ;
# endif
# endif
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
const char * fit_uname_config = images - > fit_uname_cfg ;
const char * fit_uname_config = images - > fit_uname_cfg ;
const char * fit_uname_ramdisk = NULL ;
const char * fit_uname_ramdisk = NULL ;
ulong default_addr ;
ulong default_addr ;
@ -934,7 +934,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
debug ( " ## Skipping init Ramdisk \n " ) ;
debug ( " ## Skipping init Ramdisk \n " ) ;
rd_len = rd_data = 0 ;
rd_len = rd_data = 0 ;
} else if ( select | | genimg_has_config ( images ) ) {
} else if ( select | | genimg_has_config ( images ) ) {
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
if ( select ) {
if ( select ) {
/*
/*
* If the init ramdisk comes from the FIT image and
* If the init ramdisk comes from the FIT image and
@ -965,7 +965,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
" 0x%08lx \n " ,
" 0x%08lx \n " ,
rd_addr ) ;
rd_addr ) ;
}
}
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
} else {
} else {
/* use FIT configuration provided in first bootm
/* use FIT configuration provided in first bootm
* command argument . If the property is not defined ,
* command argument . If the property is not defined ,
@ -1008,7 +1008,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
rd_load = image_get_load ( rd_hdr ) ;
rd_load = image_get_load ( rd_hdr ) ;
break ;
break ;
# endif
# endif
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
case IMAGE_FORMAT_FIT :
case IMAGE_FORMAT_FIT :
rd_noffset = fit_image_load ( images ,
rd_noffset = fit_image_load ( images ,
rd_addr , & fit_uname_ramdisk ,
rd_addr , & fit_uname_ramdisk ,
@ -1184,14 +1184,14 @@ error:
int boot_get_setup ( bootm_headers_t * images , uint8_t arch ,
int boot_get_setup ( bootm_headers_t * images , uint8_t arch ,
ulong * setup_start , ulong * setup_len )
ulong * setup_start , ulong * setup_len )
{
{
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
return boot_get_setup_fit ( images , arch , setup_start , setup_len ) ;
return boot_get_setup_fit ( images , arch , setup_start , setup_len ) ;
# else
# else
return - ENOENT ;
return - ENOENT ;
# endif
# endif
}
}
# if defined(CONF IG_FIT)
# if IMA GE_ENABLE _FIT
int boot_get_loadable ( int argc , char * const argv [ ] , bootm_headers_t * images ,
int boot_get_loadable ( int argc , char * const argv [ ] , bootm_headers_t * images ,
uint8_t arch , const ulong * ld_start , ulong * const ld_len )
uint8_t arch , const ulong * ld_start , ulong * const ld_len )
{
{