dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootm: Export bootm_decomp_image()

Browse Source 
Export this function for testing. Also add a parameter so that values other
than CONFIG_SYS_BOOTM_LEN can be used for the maximum uncompressed size.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2014-12-02 13:17:33 -07:00
committed by Tom Rini
parent cc4477289d
commit 081cc19747
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/bootm.c
View File

@@ -289,23 +289,11 @@ static int handle_decomp_error(const char *algo, size_t size, size_t unc_len,
} }
#endif #endif
/** int bootm_decomp_image(int comp, ulong load, ulong image_start, int type,
* decomp_image() - decompress the operating system void *load_buf, void *image_buf, ulong image_len,
* uint unc_len, ulong *load_end)
* @comp: Compression algorithm that is used (IH_COMP_...)
* @load: Destination load address in U-Boot memory
* @image_start Image start address (where we are decompressing from)
* @type: OS type (IH_OS_...)
* @load_bug: Place to decompress to
* @image_buf: Address to decompress from
* @return 0 if OK, -ve on error (BOOTM_ERR_...)
*/
static int decomp_image(int comp, ulong load, ulong image_start, int type,
void *load_buf, void *image_buf, ulong image_len,
ulong *load_end)
{ {
const char *type_name = genimg_get_type_name(type); const char *type_name = genimg_get_type_name(type);
__attribute__((unused)) uint unc_len = CONFIG_SYS_BOOTM_LEN;
*load_end = load; *load_end = load;
switch (comp) { switch (comp) {
@@ -413,8 +401,9 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
load_buf = map_sysmem(load, 0); load_buf = map_sysmem(load, 0);
image_buf = map_sysmem(os.image_start, image_len); image_buf = map_sysmem(os.image_start, image_len);
err = decomp_image(os.comp, load, os.image_start, os.type, load_buf, err = bootm_decomp_image(os.comp, load, os.image_start, os.type,
image_buf, image_len, load_end); load_buf, image_buf, image_len,
CONFIG_SYS_BOOTM_LEN, load_end);
if (err) { if (err) {
bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE); bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE);
return err; return err;
@@ -905,9 +894,11 @@ static int bootm_host_load_image(const void *fit, int req_image_type)
/* Allow the image to expand by a factor of 4, should be safe */ /* Allow the image to expand by a factor of 4, should be safe */
load_buf = malloc((1 << 20) + len * 4); load_buf = malloc((1 << 20) + len * 4);
ret = decomp_image(imape_comp, 0, data, image_type, load_buf, ret = bootm_decomp_image(imape_comp, 0, data, image_type, load_buf,
(void *)data, len, &load_end); (void *)data, len, CONFIG_SYS_BOOTM_LEN,
&load_end);
free(load_buf); free(load_buf);
if (ret && ret != BOOTM_ERR_UNIMPLEMENTED) if (ret && ret != BOOTM_ERR_UNIMPLEMENTED)
return ret; return ret;

17
include/bootm.h
View File

@@ -56,4 +56,21 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
void arch_preboot_os(void); void arch_preboot_os(void);
/**
* bootm_decomp_image() - decompress the operating system
*
* @comp: Compression algorithm that is used (IH_COMP_...)
* @load: Destination load address in U-Boot memory
* @image_start Image start address (where we are decompressing from)
* @type: OS type (IH_OS_...)
* @load_bug: Place to decompress to
* @image_buf: Address to decompress from
* @image_len: Number of bytes in @image_buf to decompress
* @unc_len: Available space for decompression
* @return 0 if OK, -ve on error (BOOTM_ERR_...)
*/
int bootm_decomp_image(int comp, ulong load, ulong image_start, int type,
void *load_buf, void *image_buf, ulong image_len,
uint unc_len, ulong *load_end);
#endif #endif