mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-06 05:06:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

spl: Take advantage of bl_len's power-of-twoness

Browse Source 
bl_len must be a power of two, so we can use ALIGN instead of roundup and
similar tricks to avoid divisions.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson 2023-11-08 11:48:39 -05:00 committed by Tom Rini
parent 0c6c83e6a2
commit 33c8d01a4d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/spl/spl_fit.c
View File

@ -194,7 +194,7 @@ static int get_aligned_image_overhead(struct spl_load_info *info, int offset)
if (info->filename)
return offset & (ARCH_DMA_MINALIGN - 1);
return offset % info->bl_len;
return offset & (info->bl_len - 1);
}
static int get_aligned_image_size(struct spl_load_info *info, int data_size,

8
common/spl/spl_imx_container.c
View File

@ -33,13 +33,13 @@ static struct boot_img_t *read_auth_image(struct spl_image_info *spl_image,
images = (struct boot_img_t *)((u8 *)container +
sizeof(struct container_hdr));
if (images[image_index].offset % info->bl_len) {
if (!IS_ALIGNED(images[image_index].offset, info->bl_len)) {
printf("%s: image%d offset not aligned to %u\n",
__func__, image_index, info->bl_len);
return NULL;
}
sectors = roundup(images[image_index].size, info->bl_len) /
sectors = ALIGN(images[image_index].size, info->bl_len) /
info->bl_len;
sector = images[image_index].offset / info->bl_len +
container_sector;
@ -69,7 +69,7 @@ static int read_auth_container(struct spl_image_info *spl_image,
u32 sectors;
int i, size, ret = 0;
size = roundup(CONTAINER_HDR_ALIGNMENT, info->bl_len);
size = ALIGN(CONTAINER_HDR_ALIGNMENT, info->bl_len);
sectors = size / info->bl_len;
/*
@ -103,7 +103,7 @@ static int read_auth_container(struct spl_image_info *spl_image,
debug("Container length %u\n", length);
if (length > CONTAINER_HDR_ALIGNMENT) {
size = roundup(length, info->bl_len);
size = ALIGN(length, info->bl_len);
sectors = size / info->bl_len;
free(container);