qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: weak: support soft gunzip image 

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I645627b9e6c1e027be9532f25f3da7bc1e7b6928
This commit is contained in:
Joseph Chen 2020-10-17 17:13:11 +08:00 committed by Jianhong Chen
parent c3723ef337
commit 3db2d9fdeb
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/arm/mach-rockchip/weak.c
View File

@ -21,7 +21,6 @@ DECLARE_GLOBAL_DATA_PTR;
* Override __weak board_fit_image_post_process() for SPL & U-Boot proper. * Override __weak board_fit_image_post_process() for SPL & U-Boot proper.
*/ */
#if CONFIG_IS_ENABLED(FIT_IMAGE_POST_PROCESS) #if CONFIG_IS_ENABLED(FIT_IMAGE_POST_PROCESS)
#if CONFIG_IS_ENABLED(MISC_DECOMPRESS)
#define FIT_UNCOMP_HASH_NODENAME "digest" #define FIT_UNCOMP_HASH_NODENAME "digest"
static int fit_image_check_uncomp_hash(const void *fit, int parent_noffset, static int fit_image_check_uncomp_hash(const void *fit, int parent_noffset,
@ -43,10 +42,13 @@ static int fit_image_check_uncomp_hash(const void *fit, int parent_noffset,
return 0; return 0;
} }
static int fit_hw_gunzip(void *fit, int node, ulong *load_addr, #if CONFIG_IS_ENABLED(MISC_DECOMPRESS) || CONFIG_IS_ENABLED(GZIP)
ulong **src_addr, size_t *src_len) static int fit_gunzip_image(void *fit, int node, ulong *load_addr,
ulong **src_addr, size_t *src_len)
{ {
#if CONFIG_IS_ENABLED(MISC_DECOMPRESS)
const void *prop; const void *prop;
#endif
u64 len = *src_len; u64 len = *src_len;
int ret; int ret;
u8 comp; u8 comp;
@ -62,9 +64,18 @@ static int fit_hw_gunzip(void *fit, int node, ulong *load_addr,
if (fit_image_check_type(fit, node, IH_TYPE_KERNEL)) if (fit_image_check_type(fit, node, IH_TYPE_KERNEL))
return 0; return 0;
#endif #endif
/*
* For smaller spl size, we don't use misc_decompress_process()
* inside the gunzip().
*/
#if CONFIG_IS_ENABLED(MISC_DECOMPRESS)
ret = misc_decompress_process((ulong)(*load_addr), ret = misc_decompress_process((ulong)(*load_addr),
(ulong)(*src_addr), (ulong)(*src_len), (ulong)(*src_addr), (ulong)(*src_len),
DECOM_GZIP, false, &len); DECOM_GZIP, false, &len);
#else
ret = gunzip((void *)(*load_addr), ALIGN(len, SZ_1M),
(void *)(*src_addr), (void *)(&len));
#endif
if (ret) { if (ret) {
printf("%s: decompress error, ret=%d\n", printf("%s: decompress error, ret=%d\n",
fdt_get_name(fit, node, NULL), ret); fdt_get_name(fit, node, NULL), ret);
@ -81,12 +92,14 @@ static int fit_hw_gunzip(void *fit, int node, ulong *load_addr,
*src_addr = (ulong *)*load_addr; *src_addr = (ulong *)*load_addr;
*src_len = len; *src_len = len;
#if CONFIG_IS_ENABLED(MISC_DECOMPRESS)
/* mark for misc_decompress_cleanup() */ /* mark for misc_decompress_cleanup() */
prop = fdt_getprop(fit, node, "decomp-async", NULL); prop = fdt_getprop(fit, node, "decomp-async", NULL);
if (prop) if (prop)
misc_decompress_async(comp); misc_decompress_async(comp);
else else
misc_decompress_sync(comp); misc_decompress_sync(comp);
#endif
return 0; return 0;
} }
@ -95,8 +108,8 @@ static int fit_hw_gunzip(void *fit, int node, ulong *load_addr,
void board_fit_image_post_process(void *fit, int node, ulong *load_addr, void board_fit_image_post_process(void *fit, int node, ulong *load_addr,
ulong **src_addr, size_t *src_len) ulong **src_addr, size_t *src_len)
{ {
#if CONFIG_IS_ENABLED(ROCKCHIP_HW_DECOMPRESS) #if CONFIG_IS_ENABLED(MISC_DECOMPRESS) || CONFIG_IS_ENABLED(GZIP)
fit_hw_gunzip(fit, node, load_addr, src_addr, src_len); fit_gunzip_image(fit, node, load_addr, src_addr, src_len);
#endif #endif
#if CONFIG_IS_ENABLED(USING_KERNEL_DTB) #if CONFIG_IS_ENABLED(USING_KERNEL_DTB)