U-boot Archive mirror
 help / color / mirror / Atom feed
From: Lei Wen <leiwen@marvell.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [U-BOOT] [PATCH V2] bootm: replace blob_start with image_start
Date: Mon, 10 Jan 2011 18:21:15 +0800	[thread overview]
Message-ID: <1294654875-6414-1-git-send-email-leiwen@marvell.com> (raw)
In-Reply-To: <AANLkTi=gmkT8rtwHp8ZSBhKE9UZ5hbH4QGCOYLT2XXyV@mail.gmail.com>

For uImage always has a 64 bytes header, we couldn't expect to do
the xip from the header but should xip from the image start.

The latter logic in that section is also move the image from image_start
to the load address, so sync this logic to the xip operation.

Signed-off-by: Lei Wen <leiwen@marvell.com>
---
V2: keep the original XIP setting to compare with blob_start.
	This would make original uImage still could works, since
	it modify the make uImage Makefile in the kernel.

 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 18019d6..778f6a4 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -344,7 +344,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 
 	switch (comp) {
 	case IH_COMP_NONE:
-		if (load == blob_start) {
+		if (load == blob_start || load == image_start) {
 			printf ("   XIP %s ... ", type_name);
 		} else {
 			printf ("   Loading %s ... ", type_name);
-- 
1.7.0.4

  parent reply	other threads:[~2011-01-10 10:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-10  9:31 [U-Boot] [U-BOOT] [PATCH] bootm: replace blob_start with image_start Lei Wen
2011-01-10  9:45 ` Mike Frysinger
2011-01-10 10:02   ` Lei Wen
2011-01-10 10:21   ` Lei Wen [this message]
2011-02-04  2:32     ` [U-Boot] [U-BOOT] [PATCH V2] " Lei Wen
2011-02-05  7:57       ` Albert ARIBAUD
2011-02-15  8:19         ` Mike Frysinger
2011-02-15  8:18       ` Mike Frysinger
2011-04-11 19:10     ` Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1294654875-6414-1-git-send-email-leiwen@marvell.com \
    --to=leiwen@marvell.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).