mirror of
https://github.com/linux-sunxi/u-boot-sunxi.git
synced 2024-02-12 11:16:03 +08:00
common: Remove genimg_get_image()
Removal of the legacy DataFlash code turned genimg_get_image() into a no-op. Drop all calls to it and the function itself. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
This commit is contained in:

committed by
Tom Rini

parent
c68c03f52b
commit
137aefba03
@ -810,9 +810,6 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
|
|||||||
|
|
||||||
bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);
|
bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);
|
||||||
|
|
||||||
/* copy from dataflash if needed */
|
|
||||||
img_addr = genimg_get_image(img_addr);
|
|
||||||
|
|
||||||
/* check image type, for FIT images get FIT kernel node */
|
/* check image type, for FIT images get FIT kernel node */
|
||||||
*os_data = *os_len = 0;
|
*os_data = *os_len = 0;
|
||||||
buf = map_sysmem(img_addr, 0);
|
buf = map_sysmem(img_addr, 0);
|
||||||
|
@ -294,9 +294,6 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
|
|||||||
debug("## Checking for 'FDT'/'FDT Image' at %08lx\n",
|
debug("## Checking for 'FDT'/'FDT Image' at %08lx\n",
|
||||||
fdt_addr);
|
fdt_addr);
|
||||||
|
|
||||||
/* copy from dataflash if needed */
|
|
||||||
fdt_addr = genimg_get_image(fdt_addr);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if there is an FDT image at the
|
* Check if there is an FDT image at the
|
||||||
* address provided in the second bootm argument
|
* address provided in the second bootm argument
|
||||||
|
@ -385,9 +385,6 @@ void image_print_contents(const void *ptr)
|
|||||||
* flag. Verification done covers data and header integrity and os/type/arch
|
* flag. Verification done covers data and header integrity and os/type/arch
|
||||||
* fields checking.
|
* fields checking.
|
||||||
*
|
*
|
||||||
* If dataflash support is enabled routine checks for dataflash addresses
|
|
||||||
* and handles required dataflash reads.
|
|
||||||
*
|
|
||||||
* returns:
|
* returns:
|
||||||
* pointer to a ramdisk image header, if image was found and valid
|
* pointer to a ramdisk image header, if image was found and valid
|
||||||
* otherwise, return NULL
|
* otherwise, return NULL
|
||||||
@ -885,23 +882,6 @@ int genimg_get_format(const void *img_addr)
|
|||||||
return IMAGE_FORMAT_INVALID;
|
return IMAGE_FORMAT_INVALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* genimg_get_image - get image from special storage (if necessary)
|
|
||||||
* @img_addr: image start address
|
|
||||||
*
|
|
||||||
* genimg_get_image() checks if provided image start address is located
|
|
||||||
* in a dataflash storage. If so, image is moved to a system RAM memory.
|
|
||||||
*
|
|
||||||
* returns:
|
|
||||||
* image start address after possible relocation from special storage
|
|
||||||
*/
|
|
||||||
ulong genimg_get_image(ulong img_addr)
|
|
||||||
{
|
|
||||||
ulong ram_addr = img_addr;
|
|
||||||
|
|
||||||
return ram_addr;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fit_has_config - check if there is a valid FIT configuration
|
* fit_has_config - check if there is a valid FIT configuration
|
||||||
* @images: pointer to the bootm command headers structure
|
* @images: pointer to the bootm command headers structure
|
||||||
@ -1034,9 +1014,6 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* copy from dataflash if needed */
|
|
||||||
rd_addr = genimg_get_image(rd_addr);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if there is an initrd image at the
|
* Check if there is an initrd image at the
|
||||||
* address provided in the second bootm argument
|
* address provided in the second bootm argument
|
||||||
@ -1268,10 +1245,8 @@ int boot_get_fpga(int argc, char * const argv[], bootm_headers_t *images,
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Obtain the os FIT header from the images struct
|
* Obtain the os FIT header from the images struct
|
||||||
* copy from dataflash if needed
|
|
||||||
*/
|
*/
|
||||||
tmp_img_addr = map_to_sysmem(images->fit_hdr_os);
|
tmp_img_addr = map_to_sysmem(images->fit_hdr_os);
|
||||||
tmp_img_addr = genimg_get_image(tmp_img_addr);
|
|
||||||
buf = map_sysmem(tmp_img_addr, 0);
|
buf = map_sysmem(tmp_img_addr, 0);
|
||||||
/*
|
/*
|
||||||
* Check image type. For FIT images get FIT node
|
* Check image type. For FIT images get FIT node
|
||||||
@ -1380,10 +1355,8 @@ int boot_get_loadable(int argc, char * const argv[], bootm_headers_t *images,
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Obtain the os FIT header from the images struct
|
* Obtain the os FIT header from the images struct
|
||||||
* copy from dataflash if needed
|
|
||||||
*/
|
*/
|
||||||
tmp_img_addr = map_to_sysmem(images->fit_hdr_os);
|
tmp_img_addr = map_to_sysmem(images->fit_hdr_os);
|
||||||
tmp_img_addr = genimg_get_image(tmp_img_addr);
|
|
||||||
buf = map_sysmem(tmp_img_addr, 0);
|
buf = map_sysmem(tmp_img_addr, 0);
|
||||||
/*
|
/*
|
||||||
* Check image type. For FIT images get FIT node
|
* Check image type. For FIT images get FIT node
|
||||||
|
@ -558,7 +558,6 @@ ulong genimg_get_kernel_addr_fit(char * const img_addr,
|
|||||||
ulong genimg_get_kernel_addr(char * const img_addr);
|
ulong genimg_get_kernel_addr(char * const img_addr);
|
||||||
int genimg_get_format(const void *img_addr);
|
int genimg_get_format(const void *img_addr);
|
||||||
int genimg_has_config(bootm_headers_t *images);
|
int genimg_has_config(bootm_headers_t *images);
|
||||||
ulong genimg_get_image(ulong img_addr);
|
|
||||||
|
|
||||||
int boot_get_fpga(int argc, char * const argv[], bootm_headers_t *images,
|
int boot_get_fpga(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);
|
||||||
|
Reference in New Issue
Block a user