diff options
| author | Tom Rini <[email protected]> | 2018-08-03 10:08:13 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-08-03 10:08:13 -0400 |
| commit | a30691a538b0894dfc0076150b8a3a7326b9e45a (patch) | |
| tree | 2d12b0e66b9baa83199c74b5d9b392e09b529f79 /common | |
| parent | a839c3641e4de98981695056eeeb2ec17ba1a4ab (diff) | |
| parent | cee02e6ff422fdb8b543a8097b84a9682785f46d (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_ram.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index a1e7b9fa914..eda84d0c74c 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; u32 *boot_params_ptr = NULL; /* See spl.h for information about this */ -binman_sym_declare(ulong, u_boot_any, pos); +binman_sym_declare(ulong, u_boot_any, image_pos); /* Define board data structure */ static bd_t bdata __attribute__ ((section(".data"))); @@ -129,7 +129,7 @@ __weak void spl_board_prepare_for_boot(void) void spl_set_header_raw_uboot(struct spl_image_info *spl_image) { - ulong u_boot_pos = binman_sym(ulong, u_boot_any, pos); + ulong u_boot_pos = binman_sym(ulong, u_boot_any, image_pos); spl_image->size = CONFIG_SYS_MONITOR_LEN; diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index e8701934b87..e594beaeaa3 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -49,7 +49,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, load.read = spl_ram_load_read; spl_load_simple_fit(spl_image, &load, 0, header); } else { - ulong u_boot_pos = binman_sym(ulong, u_boot_any, pos); + ulong u_boot_pos = binman_sym(ulong, u_boot_any, image_pos); debug("Legacy image\n"); /* |