[U-Boot] [U-BOOT] [PATCH] bootm: replace blob_start with image_start

[U-Boot] [U-BOOT] [PATCH] bootm: replace blob_start with image_start

[Lei Wen]

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>
---
 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..81fc4be 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 == image_start) {
 			printf ("   XIP %s ... ", type_name);
 		} else {
 			printf ("   Loading %s ... ", type_name);
-- 
1.7.0.4

[U-Boot] [U-BOOT] [PATCH] bootm: replace blob_start with image_start

[Mike Frysinger]

On Mon, Jan 10, 2011 at 4:31 AM, Lei Wen wrote:
> ? ? ? ?case IH_COMP_NONE:
> - ? ? ? ? ? ? ? if (load == blob_start) {
> + ? ? ? ? ? ? ? if (load == image_start) {
> ? ? ? ? ? ? ? ? ? ? ? ?printf (" ? XIP %s ... ", type_name);

this breaks XIP uImages that are created to work with existing
u-boots.  it'd be annoying to no longer be able to boot uImages that
were working, and update kernel build systems that output those uImage
formats.

so could you add your check as an additional one ?
if (load == blob_start || load == image_start) {
    ...
-mike

[U-Boot] [U-BOOT] [PATCH] bootm: replace blob_start with image_start

[Lei Wen]

On Mon, Jan 10, 2011 at 5:45 PM, Mike Frysinger <vapier@gentoo.org> wrote:
> On Mon, Jan 10, 2011 at 4:31 AM, Lei Wen wrote:
>> ? ? ? ?case IH_COMP_NONE:
>> - ? ? ? ? ? ? ? if (load == blob_start) {
>> + ? ? ? ? ? ? ? if (load == image_start) {
>> ? ? ? ? ? ? ? ? ? ? ? ?printf (" ? XIP %s ... ", type_name);
>
> this breaks XIP uImages that are created to work with existing
> u-boots. ?it'd be annoying to no longer be able to boot uImages that
> were working, and update kernel build systems that output those uImage
> formats.
>
> so could you add your check as an additional one ?
> if (load == blob_start || load == image_start) {
> ? ?...
> -mike

Understand...
I would submit a updated patch adopt it.

Best regards,
Lei

[U-Boot] [U-BOOT] [PATCH V2] bootm: replace blob_start with image_start

[Lei Wen]

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

[U-Boot] [U-BOOT] [PATCH V2] bootm: replace blob_start with image_start

[Lei Wen]

Hi Albert,

On Mon, Jan 10, 2011 at 6:21 PM, Lei Wen <leiwen@marvell.com> 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 <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

How about merge this patch into arm git tree?

Thanks,
Lei

[U-Boot] [U-BOOT] [PATCH V2] bootm: replace blob_start with image_start

[Albert ARIBAUD]

Le 04/02/2011 03:32, Lei Wen a ?crit :
> Hi Albert,
>
> On Mon, Jan 10, 2011 at 6:21 PM, Lei Wen<leiwen@marvell.com>  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<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
>
> How about merge this patch into arm git tree?

Mike,

Did you re-test patch V2?

> Thanks,
> Lei

Amicalement,
-- 
Albert.

[U-Boot] [U-BOOT] [PATCH V2] bootm: replace blob_start with image_start

[Mike Frysinger]

On Thursday, February 03, 2011 21:32:10 Lei Wen wrote:
> 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 <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);
> 
> How about merge this patch into arm git tree?

this is not an arm patch and so is not appropriate for that repo.  it needs to 
go through Wolfgang.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110215/169a74b1/attachment.pgp 

[U-Boot] [U-BOOT] [PATCH V2] bootm: replace blob_start with image_start

[Mike Frysinger]

On Saturday, February 05, 2011 02:57:42 Albert ARIBAUD wrote:
> Did you re-test patch V2?

i didnt test either ... v2 looks pretty straight forward though

Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110215/8f13b996/attachment.pgp 

[U-Boot] [U-BOOT] [PATCH V2] bootm: replace blob_start with image_start

[Wolfgang Denk]

Dear Lei Wen,

In message <1294654875-6414-1-git-send-email-leiwen@marvell.com> you 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 <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(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Sometimes a man will tell his bartender things he'll never tell his doctor.
	-- Dr. Phillip Boyce, "The Menagerie" ("The Cage"),
	   stardate unknown.