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

rockchip: boot_rkimg: import sysmem to alloc image buffer 

sysmem avoids memory block overlap with each other.

Change-Id: I7c705c7860a7c88b0d3672b6b4edb8cb8334654d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2019-01-14 09:54:48 +08:00 committed by Kever Yang
parent 9866229841
commit 2280fbdd62
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/boot_rkimg.c
View File

@ -15,6 +15,7 @@
#include <asm/arch/boot_mode.h>
#include <asm/io.h>
#include <part.h>
#include <sysmem.h>
#define TAG_KERNEL 0x4C4E524B
@ -92,6 +93,7 @@ static int read_rockchip_image(struct blk_desc *dev_desc,
void *dst)
{
struct rockchip_image *img;
const char *name;
int header_len = 8;
int cnt;
int ret;
@ -99,6 +101,14 @@ static int read_rockchip_image(struct blk_desc *dev_desc,
u32 crc32;
#endif
if (!strcmp((char *)part_info->name, "kernel"))
name = "kernel";
else if (!strcmp((char *)part_info->name, "boot") ||
!strcmp((char *)part_info->name, "recovery"))
name = "ramdisk";
else
name = NULL;
img = memalign(ARCH_DMA_MINALIGN, RK_BLK_SIZE);
if (!img) {
printf("out of memory\n");
@ -118,12 +128,17 @@ static int read_rockchip_image(struct blk_desc *dev_desc,
goto err;
}
memcpy(dst, img->image, RK_BLK_SIZE - header_len);
/*
* read the rest blks
* total size = image size + 8 bytes header + 4 bytes crc32
*/
cnt = DIV_ROUND_UP(img->size + 8 + 4, RK_BLK_SIZE);
if (!sysmem_alloc_base(name, (phys_addr_t)dst, cnt * dev_desc->blksz)) {
ret = -ENXIO;
goto err;
}
memcpy(dst, img->image, RK_BLK_SIZE - header_len);
ret = blk_dread(dev_desc, part_info->start + 1, cnt - 1,
dst + RK_BLK_SIZE - header_len);
if (ret != (cnt - 1)) {
@ -466,6 +481,9 @@ int boot_rockchip_image(struct blk_desc *dev_desc, disk_partition_t *boot_part)
printf("fdt @ 0x%08lx (0x%08x)\n", fdt_addr_r, fdt_totalsize(fdt_addr_r));
printf("kernel @ 0x%08lx (0x%08x)\n", kernel_addr_r, kernel_size);
printf("ramdisk @ 0x%08lx (0x%08x)\n", ramdisk_addr_r, ramdisk_size);
sysmem_dump_check();
#if defined(CONFIG_ARM64)
char cmdbuf[64];
sprintf(cmdbuf, "booti 0x%lx 0x%lx:0x%x 0x%lx",