mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +00:00
5271e359a4
Aligning addresses and sizes causes overhead which is unnecessary when we are not loading from block devices. Remove bl_len when it is not needed. For example, on iot2050 we save 144 bytes with this patch (once the rest of this series is applied): add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-144 (-144) Function old new delta spl_load_simple_fit 920 904 -16 load_simple_fit 496 444 -52 spl_spi_load_image 384 308 -76 Total: Before=87431, After=87287, chg -0.16% We use panic() instead of BUILD_BUG_ON in spl_set_bl_len because we still need to be able to compile it for things like mmc_load_image_raw_sector, even if that function will not be used. Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
74 lines
1.5 KiB
C
74 lines
1.5 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright 2021 Google LLC
|
|
* Written by Simon Glass <sjg@chromium.org>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <image.h>
|
|
#include <os.h>
|
|
#include <spl.h>
|
|
#include <test/spl.h>
|
|
#include <test/ut.h>
|
|
|
|
/* Context used for this test */
|
|
struct text_ctx {
|
|
int fd;
|
|
};
|
|
|
|
static ulong read_fit_image(struct spl_load_info *load, ulong offset,
|
|
ulong size, void *buf)
|
|
{
|
|
struct text_ctx *text_ctx = load->priv;
|
|
off_t ret;
|
|
ssize_t res;
|
|
|
|
ret = os_lseek(text_ctx->fd, offset, OS_SEEK_SET);
|
|
if (ret != offset) {
|
|
printf("Failed to seek to %zx, got %zx (errno=%d)\n", offset,
|
|
ret, errno);
|
|
return 0;
|
|
}
|
|
|
|
res = os_read(text_ctx->fd, buf, size);
|
|
if (res == -1) {
|
|
printf("Failed to read %lx bytes, got %ld (errno=%d)\n",
|
|
size, res, errno);
|
|
return 0;
|
|
}
|
|
|
|
return size;
|
|
}
|
|
|
|
static int spl_test_load(struct unit_test_state *uts)
|
|
{
|
|
struct spl_image_info image;
|
|
struct legacy_img_hdr *header;
|
|
struct text_ctx text_ctx;
|
|
struct spl_load_info load;
|
|
char fname[256];
|
|
int ret;
|
|
int fd;
|
|
|
|
memset(&load, '\0', sizeof(load));
|
|
spl_set_bl_len(&load, 512);
|
|
load.read = read_fit_image;
|
|
|
|
ret = sandbox_find_next_phase(fname, sizeof(fname), true);
|
|
if (ret)
|
|
ut_assertf(0, "%s not found, error %d\n", fname, ret);
|
|
|
|
header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
|
|
|
|
fd = os_open(fname, OS_O_RDONLY);
|
|
ut_assert(fd >= 0);
|
|
ut_asserteq(512, os_read(fd, header, 512));
|
|
text_ctx.fd = fd;
|
|
|
|
load.priv = &text_ctx;
|
|
|
|
ut_assertok(spl_load_simple_fit(&image, &load, 0, header));
|
|
|
|
return 0;
|
|
}
|
|
SPL_TEST(spl_test_load, 0);
|