u-boot/common/spl/spl_ymodem.c
Sean Anderson 5271e359a4 spl: Only support bl_len when we have to
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>
2023-11-16 13:49:14 -05:00

192 lines
4.2 KiB
C

// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* (C) Copyright 2011
* Texas Instruments, <www.ti.com>
*
* Matt Porter <mporter@ti.com>
*/
#include <common.h>
#include <gzip.h>
#include <image.h>
#include <log.h>
#include <spl.h>
#include <xyzModem.h>
#include <asm/u-boot.h>
#include <linux/libfdt.h>
#define BUF_SIZE 1024
/*
* Information required to load image using ymodem.
*
* @image_read: Now of bytes read from the image.
* @buf: pointer to the previous read block.
*/
struct ymodem_fit_info {
int image_read;
char *buf;
};
static int getcymodem(void) {
if (tstc())
return (getchar());
return -1;
}
static ulong ymodem_read_fit(struct spl_load_info *load, ulong offset,
ulong size, void *addr)
{
int res, err, buf_offset;
struct ymodem_fit_info *info = load->priv;
char *buf = info->buf;
ulong copy_size = size;
while (info->image_read < offset) {
res = xyzModem_stream_read(buf, BUF_SIZE, &err);
if (res <= 0)
break;
info->image_read += res;
}
if (info->image_read > offset) {
res = info->image_read - offset;
if (info->image_read % BUF_SIZE)
buf_offset = (info->image_read % BUF_SIZE);
else
buf_offset = BUF_SIZE;
if (res > copy_size) {
memcpy(addr, &buf[buf_offset - res], copy_size);
goto done;
}
memcpy(addr, &buf[buf_offset - res], res);
addr = addr + res;
copy_size -= res;
}
while (info->image_read < offset + size) {
res = xyzModem_stream_read(buf, BUF_SIZE, &err);
if (res <= 0)
break;
info->image_read += res;
if (res > copy_size) {
memcpy(addr, buf, copy_size);
goto done;
}
memcpy(addr, buf, res);
addr += res;
copy_size -= res;
}
done:
return size;
}
int spl_ymodem_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
ulong size = 0;
int err;
int res;
int ret;
connection_info_t info;
char buf[BUF_SIZE];
struct legacy_img_hdr *ih = NULL;
ulong addr = 0;
info.mode = xyzModem_ymodem;
ret = xyzModem_stream_open(&info, &err);
if (ret) {
printf("spl: ymodem err - %s\n", xyzModem_error(err));
return ret;
}
res = xyzModem_stream_read(buf, BUF_SIZE, &err);
if (res <= 0)
goto end_stream;
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
image_get_magic((struct legacy_img_hdr *)buf) == FDT_MAGIC) {
addr = CONFIG_SYS_LOAD_ADDR;
ih = (struct legacy_img_hdr *)addr;
memcpy((void *)addr, buf, res);
size += res;
addr += res;
while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0) {
memcpy((void *)addr, buf, res);
size += res;
addr += res;
}
ret = spl_parse_image_header(spl_image, bootdev, ih);
if (ret)
return ret;
} else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic((struct legacy_img_hdr *)buf) == FDT_MAGIC) {
struct spl_load_info load;
struct ymodem_fit_info info;
debug("Found FIT\n");
load.priv = (void *)&info;
spl_set_bl_len(&load, 1);
info.buf = buf;
info.image_read = BUF_SIZE;
load.read = ymodem_read_fit;
ret = spl_load_simple_fit(spl_image, &load, 0, (void *)buf);
size = info.image_read;
while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0)
size += res;
} else {
ih = (struct legacy_img_hdr *)buf;
ret = spl_parse_image_header(spl_image, bootdev, ih);
if (ret)
goto end_stream;
#ifdef CONFIG_SPL_GZIP
if (ih->ih_comp == IH_COMP_GZIP)
addr = CONFIG_SYS_LOAD_ADDR;
else
#endif
addr = spl_image->load_addr;
memcpy((void *)addr, buf, res);
ih = (struct legacy_img_hdr *)addr;
size += res;
addr += res;
while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0) {
memcpy((void *)addr, buf, res);
size += res;
addr += res;
}
}
end_stream:
xyzModem_stream_close(&err);
xyzModem_stream_terminate(false, &getcymodem);
printf("Loaded %lu bytes\n", size);
#ifdef CONFIG_SPL_GZIP
if (!(IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic((struct legacy_img_hdr *)buf) == FDT_MAGIC) &&
(ih->ih_comp == IH_COMP_GZIP)) {
if (gunzip((void *)(spl_image->load_addr + sizeof(*ih)),
CONFIG_SYS_BOOTM_LEN,
(void *)(CONFIG_SYS_LOAD_ADDR + sizeof(*ih)),
&size)) {
puts("Uncompressing error\n");
return -EIO;
}
}
#endif
return ret;
}
SPL_LOAD_IMAGE_METHOD("UART", 0, BOOT_DEVICE_UART, spl_ymodem_load_image);