diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-04 09:18:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-04 14:10:39 -0400 |
| commit | e294ba0678359bc32085c1714329af37e33e8f16 (patch) | |
| tree | a2b490c6e62c63436ce660fe6986749db69d974c /common/spl | |
| parent | 948071bab44d3cbb0e1f4828739fcf0f27312d37 (diff) | |
| parent | f3fed05e095439b3fd24990e20dbea1d4b03c121 (diff) | |
Merge git://git.denx.de/u-boot-sunxi
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index b1ce56d0d0..61d3071324 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -127,8 +127,14 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) ulong u_boot_pos = binman_sym(ulong, u_boot_any, pos); spl_image->size = CONFIG_SYS_MONITOR_LEN; - if (u_boot_pos != BINMAN_SYM_MISSING) { - /* biman does not support separate entry addresses at present */ + + /* + * Binman error cases: address of the end of the previous region or the + * start of the image's entry area (usually 0) if there is no previous + * region. + */ + if (u_boot_pos && u_boot_pos != BINMAN_SYM_MISSING) { + /* Binman does not support separated entry addresses */ spl_image->entry_point = u_boot_pos; spl_image->load_addr = u_boot_pos; } else { |