summaryrefslogtreecommitdiff
path: root/fs/cbfs/cbfs.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-04-01 20:36:39 -0400
committerTom Rini <trini@konsulko.com>2018-04-01 20:36:39 -0400
commit0e5d3e311189ca07aa7b5802deaff9861fc33574 (patch)
tree13eb58a65e156180e7cb99632f35be33e10baf1c /fs/cbfs/cbfs.c
parentf3b623fa52ce5c67732ea2d789d5e21667e88db3 (diff)
parent641599a63df258c3e3cb259c75cdada0cc009d56 (diff)
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'fs/cbfs/cbfs.c')
-rw-r--r--fs/cbfs/cbfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 6e1107d751..46da8f134f 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -168,9 +168,9 @@ static int file_cbfs_load_header(uintptr_t end_of_rom,
struct cbfs_header *header)
{
struct cbfs_header *header_in_rom;
+ int32_t offset = *(u32 *)(end_of_rom - 3);
- header_in_rom = (struct cbfs_header *)(uintptr_t)
- *(u32 *)(end_of_rom - 3);
+ header_in_rom = (struct cbfs_header *)(end_of_rom + offset + 1);
swap_header(header, header_in_rom);
if (header->magic != good_magic || header->offset >