diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 10:05:42 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 10:05:42 +0200 |
commit | 05d134b084590684bcf4d832c0035952727b7cd9 (patch) | |
tree | 8f5d5fd811634fa621792cad7ca361251c06cd88 /common/cmd_bootm.c | |
parent | 6130c14605de760bdcaef36b8a0d34eac2a955f0 (diff) | |
parent | d7782d06534fe4fa47a49fa7c106de5ba85a9687 (diff) | |
download | u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.zip u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.tar.gz u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.tar.bz2 |
Merge remote-tracking branch 'u-boot/master'
Conflicts:
boards.cfg
Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatting (commit 1b37fa83).
Diffstat (limited to 'common/cmd_bootm.c')
-rw-r--r-- | common/cmd_bootm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index c243a5b..e683af3 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -388,7 +388,7 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end, image_buf = map_sysmem(image_start, image_len); switch (comp) { case IH_COMP_NONE: - if (load == blob_start || load == image_start) { + if (load == image_start) { printf(" XIP %s ... ", type_name); no_overlap = 1; } else { |