arm/km: replace suenx targets with km_kirkwood

-----Original Message-----
From: Prafulla Wadaskar
Sent: Saturday, June 11, 2011 9:53 AM
To: 'Holger Brunck'; u-boot at lists.denx.de
Cc: Valentin Longchamp; Heiko Schocher
Subject: RE: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

Quoted 5 lines

-----Original Message-----
From: Holger Brunck [mailto:holger.brunck at keymile.com]
Sent: Wednesday, June 08, 2011 5:13 PM
To: u-boot at lists.denx.de
Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko

Schocher

Quoted 19 lines

Subject: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

suen3 and suen8 were in first HW version quite different, but now they are from a u-boot point of view similar. So these two boards can use the same header file. Other keymile boards differ only in the usage of the PCI interface. Therefore a target km_kirkwood_pci was introduced. All targets use the same header file.

Signed-off-by Holger Brunck <[email protected]>

Signed-off-by Valentin Longchamp <[email protected]>

cc Prafulla Wadaskar <[email protected]>

cc Heiko Schocher <[email protected]>

---
Changes for v2:
- squashed together with 5/6 from previous serie, because the pci defines belongs logically to this patch
- change typo in board maintainers name

Quoted 7 lines

 MAINTAINERS                                |    6 ++-
 MAKEALL                                    |    2 +-
 boards.cfg                                 |    4 +-
 include/configs/km/km_arm.h                |    1 -
 include/configs/{suen3.h => km_kirkwood.h} |   18 +++++++---
 include/configs/mgcoge3un.h                |    5 +++
 include/configs/suen8.h                    |   50 -------------------

--

Quoted 1 line

-------

Applied to u-boot-marvell.git next branch Regards..
Prafulla . .

-----Original Message-----
From: Prafulla Wadaskar
Sent: Saturday, June 11, 2011 9:53 AM
To: 'Holger Brunck'; u-boot at lists.denx.de
Cc: Valentin Longchamp; Heiko Schocher
Subject: RE: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

Quoted 5 lines

-----Original Message-----
From: Holger Brunck [mailto:holger.brunck at keymile.com]
Sent: Wednesday, June 08, 2011 5:13 PM
To: u-boot at lists.denx.de
Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko

Schocher

Quoted 19 lines

Subject: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

suen3 and suen8 were in first HW version quite different, but now they are from a u-boot point of view similar. So these two boards can use the same header file. Other keymile boards differ only in the usage of the PCI interface. Therefore a target km_kirkwood_pci was introduced. All targets use the same header file.

Signed-off-by Holger Brunck <[email protected]>

Signed-off-by Valentin Longchamp <[email protected]>

cc Prafulla Wadaskar <[email protected]>

cc Heiko Schocher <[email protected]>

---
Changes for v2:
- squashed together with 5/6 from previous serie, because the pci defines belongs logically to this patch
- change typo in board maintainers name

Quoted 7 lines

 MAINTAINERS                                |    6 ++-
 MAKEALL                                    |    2 +-
 boards.cfg                                 |    4 +-
 include/configs/km/km_arm.h                |    1 -
 include/configs/{suen3.h => km_kirkwood.h} |   18 +++++++---
 include/configs/mgcoge3un.h                |    5 +++
 include/configs/suen8.h                    |   50 -------------------

--

Quoted 1 line

-------

Applied to u-boot-marvell.git next branch Regards..
Prafulla . .

Now I have a question about the marvell boards build: I see in the Makefile that there is a rule about this kwb file, which is exactly what we do in our additionnal build script:

$(obj)u-boot.kwb: $(obj)u-boot.bin

		$(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $

How do you use it (because I think it is not called by the default make command) ?

-----Original Message-----
From: Longchamp, Valentin [mailto:Valentin.Longchamp at keymile.com]
Sent: Sunday, June 12, 2011 5:39 PM
To: Prafulla Wadaskar; Brunck, Holger; u-boot at lists.denx.de
Cc: Heiko Schocher
Subject: RE: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

Hi Prafulla,

Sorry for the bad email formatting, using webmail from home. See my answer below.

Hi Holger, Valentin

During this pull check I observed that u-boot.kwb image generation gives build errors for all Kirkwood based keymile boards.

Please kindly check on this and provide a fix.

I had noticed about this u-boot.kwb image generation earlier, but we don't use it internally yet. We would like to change this and use it (and thus fix this error).

Could you please answer my early question from this thread:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/99206

Here is my question again:

Now I have a question about the marvell boards build: I see in the Makefile that there is a rule about this kwb file, which is exactly what we do in our additionnal build script:

$(obj)u-boot.kwb: $(obj)u-boot.bin

                $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T
kwbimage \
                -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d

$< $

How do you use it (because I think it is not called by the default make command) ?

During this pull check I observed that u-boot.kwb image generation gives build errors for all Kirkwood based keymile boards.

Please kindly check on this and provide a fix.

I had noticed about this u-boot.kwb image generation earlier, but we don't use it internally yet. We would like to change this and use it (and thus fix this error).

Could you please answer my early question from this thread: http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/99206

Here is my question again:

Now I have a question about the marvell boards build: I see in the Makefile that there is a rule about this kwb file, which is exactly what we do in our additionnal build script:

$(obj)u-boot.kwb: $(obj)u-boot.bin

		$(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $

How do you use it (because I think it is not called by the default make command) ?

-----Original Message-----
From: Holger Brunck [mailto:holger.brunck at keymile.com]
Sent: Monday, June 13, 2011 12:02 AM
To: Longchamp, Valentin
Cc: Prafulla Wadaskar; u-boot at lists.denx.de; Heiko Schocher
Subject: Re: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

Hi Valentin, Prafulla,

Quoted 2 lines · Valentin

During this pull check I observed that u-boot.kwb image generation

gives build errors for all Kirkwood based keymile boards.

Quoted 4 lines

Please kindly check on this and provide a fix.

I had noticed about this u-boot.kwb image generation earlier, but we

don't use it internally yet. We would like to change this and use it (and thus fix this error).

Quoted 2 lines

Could you please answer my early question from this thread:

http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/99206

Quoted 5 lines

Here is my question again:

Now I have a question about the marvell boards build: I see in the Makefile that there is a rule about this kwb file, which is exactly

what

Quoted 7 lines

we do in our additionnal build script:

$(obj)u-boot.kwb: $(obj)u-boot.bin

		$(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $

How do you use it (because I think it is not called by the default

make

Quoted 2 lines

command) ?

I simply execute "make -s km_kirkwood u-boot.kwb" and then I see the error too. Yes our problem
was that we still use our litte make wrapper to build the kirkwood binary and therefore we didn't
saw the error. A simple make km_kirkwood works fine.

The bug was introduced due to commit 010a958b
(arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h) there we try to use the already defined CONFIG_SYS_KWD_CONFIG in arch- kirkwood/config.h what is
quite this was we should do, but we forgot to include arch- kirkwood/config.h... And because we only
tested for build errors without u-boot.kwb it seems to be ok...

So we should add this include and remove some of the defines which are part of arch-kirkwood/config.h
from our km_arm.h. But at one point we have to change arch- kirkwood/config.h. There is:

#ifdef CONFIG_CMD_I2C
#ifndef CONFIG_SOFT_I2C
#define CONFIG_I2C_MVTWSI
#define CONFIG_SYS_I2C_SLAVE 0x0

This wouldn't work for us because we have CONFIG_CMD_I2C enabled but we use SOFT_I2C and not HARD_I2C

I think it is correct if we change it to:
#ifdef CONFIG_CMD_I2C

(quoted diff) +2 -0

+#ifndef CONFIG_SOFT_I2C
 #define CONFIG_I2C_MVTWSI
+#endif
 #define CONFIG_SYS_I2C_SLAVE           0x0

Prafulla if you don't object to this change I would send a patch on tuesday when I'm back at work to
change this and to fix the build error.

Quoted 21 lines

So we should add this include and remove some of the defines which are part of arch-kirkwood/config.h
from our km_arm.h. But at one point we have to change arch- kirkwood/config.h. There is:

#ifdef CONFIG_CMD_I2C
#ifndef CONFIG_SOFT_I2C
#define CONFIG_I2C_MVTWSI
#define CONFIG_SYS_I2C_SLAVE 0x0

This wouldn't work for us because we have CONFIG_CMD_I2C enabled but we use SOFT_I2C and not HARD_I2C

I think it is correct if we change it to:
#ifdef CONFIG_CMD_I2C

(quoted diff) +2 -0

+#ifndef CONFIG_SOFT_I2C
 #define CONFIG_I2C_MVTWSI
+#endif
 #define CONFIG_SYS_I2C_SLAVE           0x0

Quoted 3 lines

Prafulla if you don't object to this change I would send a patch on tuesday when I'm back at work to
change this and to fix the build error.

Hi Holger
Ack, Pls send the patch for the same. Also send a patch to resolve build error. May be those could be two standalone patches.