From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Sat, 05 Feb 2011 08:57:42 +0100 Subject: [U-Boot] [U-BOOT] [PATCH V2] bootm: replace blob_start with image_start In-Reply-To: References: <1294654875-6414-1-git-send-email-leiwen@marvell.com> Message-ID: <4D4D02F6.5080905@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Le 04/02/2011 03:32, Lei Wen a ?crit : > Hi Albert, > > On Mon, Jan 10, 2011 at 6:21 PM, Lei Wen wrote: >> 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 >> --- >> 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 > > How about merge this patch into arm git tree? Mike, Did you re-test patch V2? > Thanks, > Lei Amicalement, -- Albert.