diff options
| author | Tom Rini | 2022-12-19 09:29:55 -0500 |
|---|---|---|
| committer | Tom Rini | 2022-12-21 13:09:01 -0500 |
| commit | 14f43797d0a696248c09d298e2f2809dded345ba (patch) | |
| tree | 23fc5bc462689f07f389cc0b8e7f7bedd35253ff /common | |
| parent | 9c955393f7a27ded250fef7688e0065b44a3343f (diff) | |
| parent | 2243922edca9f56a9d5519b9d6e36f5d7a18434d (diff) | |
Merge tag 'v2023.01-rc4' into next
Prepare v2023.01-rc4
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 2 | ||||
| -rw-r--r-- | common/spl/spl_legacy.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index c6da4a403e9..1657c2ca969 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -691,7 +691,7 @@ config SPL_FS_FAT config SPL_FS_LOAD_PAYLOAD_NAME string "File to load for U-Boot from the filesystem" - depends on SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS + depends on SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS || SPL_SEMIHOSTING default "tispl.bin" if SYS_K3_SPL_ATF default "u-boot.itb" if SPL_LOAD_FIT default "u-boot.img" diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index 4c7f44687e8..16851c55eb5 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -106,7 +106,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, * is set */ if (spl_image->flags & SPL_COPY_PAYLOAD_ONLY) - dataptr += sizeof(hdr); + dataptr += sizeof(*hdr); load->read(load, dataptr, spl_image->size, (void *)(unsigned long)spl_image->load_addr); @@ -116,7 +116,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, lzma_len = LZMA_LEN; /* dataptr points to compressed payload */ - dataptr = offset + sizeof(hdr); + dataptr = offset + sizeof(*hdr); debug("LZMA: Decompressing %08lx to %08lx\n", dataptr, spl_image->load_addr); |