diff mbox

[U-Boot,v1,22/25] tools/kwboot: Sync with latest barebox version to support Armada XP

Message ID 20140703220246.GA8506@w500.lan
State Deferred
Delegated to: Stefan Roese
Headers show

Commit Message

Luka Perkov July 3, 2014, 10:02 p.m. UTC 
Hi Stefan,

On Fri, Jun 27, 2014 at 11:55:08AM +0200, Stefan Roese wrote:
> The barebox version of the kwboot tool has evolved a bit. To support
> Armada XP and Dove. Additionally a few minor fixes have been applied.
> So lets sync with the latest barebox version.
> 
> Please note that the main difference between both versions now is, that
> the U-Boot version still supports the -p option, to dynamically patch
> an image for UART boot mode. I didn't test it now though.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
> 
>  tools/kwboot.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++---------
>  1 file changed, 83 insertions(+), 14 deletions(-)

...

> -#define KWBOOT_MSG_REQ_DELAY	10 /* ms */
> -#define KWBOOT_MSG_RSP_TIMEO	50 /* ms */
> +static unsigned char kwboot_msg_debug[] = {
> +	0xDD, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77
> +};
> +
> +#define KWBOOT_MSG_REQ_DELAY	1000 /* ms */
> +#define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */

This causes problems on kirkwood. The old values should be kept, apply
the patch below to this one. After that chage feel free to add Tested-by
line.

Tested-by: Luka Perkov <luka@openwrt.org>

Now only to figure out why 21/25 breaks things on kirkwood.

Luka

Comments

Stefan Roese July 28, 2014, 6:47 a.m. UTC | #1 
Hi Luka!

Sorry for the late reply to this comment.

On 04.07.2014 00:02, Luka Perkov wrote:
> Hi Stefan,
>
> On Fri, Jun 27, 2014 at 11:55:08AM +0200, Stefan Roese wrote:
>> The barebox version of the kwboot tool has evolved a bit. To support
>> Armada XP and Dove. Additionally a few minor fixes have been applied.
>> So lets sync with the latest barebox version.
>>
>> Please note that the main difference between both versions now is, that
>> the U-Boot version still supports the -p option, to dynamically patch
>> an image for UART boot mode. I didn't test it now though.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> ---
>>
>>   tools/kwboot.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++---------
>>   1 file changed, 83 insertions(+), 14 deletions(-)
>
> ...
>
>> -#define KWBOOT_MSG_REQ_DELAY	10 /* ms */
>> -#define KWBOOT_MSG_RSP_TIMEO	50 /* ms */
>> +static unsigned char kwboot_msg_debug[] = {
>> +	0xDD, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77
>> +};
>> +
>> +#define KWBOOT_MSG_REQ_DELAY	1000 /* ms */
>> +#define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */
>
> This causes problems on kirkwood. The old values should be kept, apply
> the patch below to this one. After that chage feel free to add Tested-by
> line.
>
> Tested-by: Luka Perkov <luka@openwrt.org>
>
> Now only to figure out why 21/25 breaks things on kirkwood.
>
> Luka
>
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index c47970e..ccc9d90 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -42,8 +42,8 @@ static unsigned char kwboot_msg_debug[] = {
>   	0xDD, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77
>   };
>
> -#define KWBOOT_MSG_REQ_DELAY	1000 /* ms */
> -#define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */
> +#define KWBOOT_MSG_REQ_DELAY	10 /* ms */
> +#define KWBOOT_MSG_RSP_TIMEO	50 /* ms */

Unfortunately these settings do not work with Armada XP. I tested a bit 
and it seems that e.g. this setting works on Armada XP:

#define KWBOOT_MSG_REQ_DELAY	10 /* ms */
#define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */

Could you please check this on your Kirkwood platform? And perhaps find 
a configuration that works for the SoC's? That would be great!

Thanks,
Stefan
Luka Perkov July 29, 2014, 11:16 p.m. UTC | #2 
Hi Stefan,

On Mon, Jul 28, 2014 at 08:47:13AM +0200, Stefan Roese wrote:
> Sorry for the late reply to this comment.
> 
> On 04.07.2014 00:02, Luka Perkov wrote:
> >On Fri, Jun 27, 2014 at 11:55:08AM +0200, Stefan Roese wrote:
> >>The barebox version of the kwboot tool has evolved a bit. To support
> >>Armada XP and Dove. Additionally a few minor fixes have been applied.
> >>So lets sync with the latest barebox version.
> >>
> >>Please note that the main difference between both versions now is, that
> >>the U-Boot version still supports the -p option, to dynamically patch
> >>an image for UART boot mode. I didn't test it now though.
> >>
> >>Signed-off-by: Stefan Roese <sr@denx.de>
> >>---
> >>
> >>  tools/kwboot.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++---------
> >>  1 file changed, 83 insertions(+), 14 deletions(-)
> >
> >...
> >
> >>-#define KWBOOT_MSG_REQ_DELAY	10 /* ms */
> >>-#define KWBOOT_MSG_RSP_TIMEO	50 /* ms */
> >>+static unsigned char kwboot_msg_debug[] = {
> >>+	0xDD, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77
> >>+};
> >>+
> >>+#define KWBOOT_MSG_REQ_DELAY	1000 /* ms */
> >>+#define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */
> >
> >This causes problems on kirkwood. The old values should be kept, apply
> >the patch below to this one. After that chage feel free to add Tested-by
> >line.
> >
> >Tested-by: Luka Perkov <luka@openwrt.org>
> >
> >Now only to figure out why 21/25 breaks things on kirkwood.
> >
> >Luka
> >
> >diff --git a/tools/kwboot.c b/tools/kwboot.c
> >index c47970e..ccc9d90 100644
> >--- a/tools/kwboot.c
> >+++ b/tools/kwboot.c
> >@@ -42,8 +42,8 @@ static unsigned char kwboot_msg_debug[] = {
> >  	0xDD, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77
> >  };
> >
> >-#define KWBOOT_MSG_REQ_DELAY	1000 /* ms */
> >-#define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */
> >+#define KWBOOT_MSG_REQ_DELAY	10 /* ms */
> >+#define KWBOOT_MSG_RSP_TIMEO	50 /* ms */
> 
> Unfortunately these settings do not work with Armada XP. I tested a bit and
> it seems that e.g. this setting works on Armada XP:
> 
> #define KWBOOT_MSG_REQ_DELAY	10 /* ms */
> #define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */
> 
> Could you please check this on your Kirkwood platform? And perhaps find a
> configuration that works for the SoC's? That would be great!

I just tried this and it does not work on kirkwood. I've stumbled upon
this thread though, it might be useful:

http://lists.infradead.org/pipermail/barebox/2014-June/019618.html

Can we just add a flag to kwboot which will use appropriate values for
kirkwood and armada? We can keep kirkwood by default, that way we won't
break anything.

Luka
Stefan Roese July 30, 2014, 8:53 a.m. UTC | #3 
Hi Luka,

On 30.07.2014 01:16, Luka Perkov wrote:

<snip>

>>> -#define KWBOOT_MSG_REQ_DELAY	1000 /* ms */
>>> -#define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */
>>> +#define KWBOOT_MSG_REQ_DELAY	10 /* ms */
>>> +#define KWBOOT_MSG_RSP_TIMEO	50 /* ms */
>>
>> Unfortunately these settings do not work with Armada XP. I tested a bit and
>> it seems that e.g. this setting works on Armada XP:
>>
>> #define KWBOOT_MSG_REQ_DELAY	10 /* ms */
>> #define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */
>>
>> Could you please check this on your Kirkwood platform? And perhaps find a
>> configuration that works for the SoC's? That would be great!
>
> I just tried this and it does not work on kirkwood. I've stumbled upon
> this thread though, it might be useful:
>
> http://lists.infradead.org/pipermail/barebox/2014-June/019618.html

Yes, thanks.

> Can we just add a flag to kwboot which will use appropriate values for
> kirkwood and armada? We can keep kirkwood by default, that way we won't
> break anything.

If nobody comes up with a working solution (timeout values that work for 
both SoC's), then such a parameter is of course an option.

Thanks,
Stefan
diff mbox

Patch

diff --git a/tools/kwboot.c b/tools/kwboot.c
index c47970e..ccc9d90 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -42,8 +42,8 @@  static unsigned char kwboot_msg_debug[] = {
 	0xDD, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77
 };
 
-#define KWBOOT_MSG_REQ_DELAY	1000 /* ms */
-#define KWBOOT_MSG_RSP_TIMEO	1000 /* ms */
+#define KWBOOT_MSG_REQ_DELAY	10 /* ms */
+#define KWBOOT_MSG_RSP_TIMEO	50 /* ms */
 
 /*
  * Xmodem Transfers