[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Holger Brunck]

Hi Valentin, Prafulla,

On 12/06/11 14:09, Longchamp, Valentin wrote:
> 
> 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) ?
> 

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
+#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.

Best regards
Holger