cmd: bootrkp: use align address to load image

Without this change, the mmc bounce buffer would use malloc
and memcpy actions to load the image on unaligned address.

Let's simplify that with a final memcpy action, which
indenpends on malloc pool size.

Signed-off-by: Joseph Chen <[email protected]>
Change-Id: I50158d93cda45d517c8ac1de0c95357973a1d40a

Author: JosephChen2017

cmd/bootrkp.c

@@ -168,51 +168,36 @@ static void boot_lmb_init(bootm_headers_t *images)
 static int read_rockchip_image(struct blk_desc *dev_desc,
 			       disk_partition_t *part, void *dst)
 {
-	struct rockchip_image *img;
+	struct rockchip_image *img = dst;
 	int header_len = 8;
 	int cnt, ret;
 #ifdef CONFIG_ROCKCHIP_CRC
 	u32 crc32;
 #endif
-
-	img = memalign(ARCH_DMA_MINALIGN, RK_BLK_SIZE);
-	if (!img)
-		return -ENOMEM;
-
-	/* read first block with header imformation */
 	ret = blk_dread(dev_desc, part->start, 1, img);
-	if (ret != 1) {
-		ret = -EIO;
-		goto err;
-	}
+	if (ret != 1)
+		return -EIO;
 
 	if (img->tag != TAG_KERNEL) {
 		printf("Invalid %s image tag(0x%x)\n", part->name, img->tag);
-		ret = -EINVAL;
-		goto err;
+		return -EINVAL;
 	}
 
-	/*
-	 * read the rest blks
-	 * total size = image size + 8 bytes header + 4 bytes crc32
-	 */
+	/* 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_by_name((const char *)part->name,
 				       (phys_addr_t)dst,
-				       cnt * dev_desc->blksz)) {
-		ret = -ENXIO;
-		goto err;
-	}
+				       cnt * dev_desc->blksz))
+		return -ENXIO;
 
-	memcpy(dst, img->image, RK_BLK_SIZE - header_len);
-	ret = blk_dread(dev_desc, part->start + 1, cnt - 1,
-			dst + RK_BLK_SIZE - header_len);
-	if (ret != (cnt - 1)) {
-		printf("Failed to read %s part, ret=%d\n", part->name, ret);
-		ret = -EIO;
+	ret = blk_dread(dev_desc, part->start, cnt, dst);
+	if (ret != cnt) {
+		printf("Failed to read %s part, blkcnt=%d\n", part->name, ret);
+		return -EIO;
 	} else {
 		ret = img->size;
 	}
+	memcpy(dst, dst + header_len, img->size);
 
 #ifdef CONFIG_ROCKCHIP_CRC
 	printf("%s image rk crc32 verify... ", part->name);
@@ -224,9 +209,6 @@ static int read_rockchip_image(struct blk_desc *dev_desc,
 		printf("okay.\n");
 	}
 #endif
-
-err:
-	free(img);
 	return ret;
 }