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

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>

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 70d8d5942d96c6e6017007405a1fac2a2846aaa1..6084ead0919bf8c4c7d15954fb856217251d3bb4 100644 (file)
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -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,

diff --git a/common/spl/spl_imx_container.c b/common/spl/spl_imx_container.c
index 127802f5cb7769957a21876e39280ddd8c5b01be..1cc517827668f5b100947920e100f63ee54dbbe8 100644 (file)
--- a/common/spl/spl_imx_container.c
+++ b/common/spl/spl_imx_container.c
@@ -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);