[U-Boot] [PATCH 2/2] arm/km: fix u-boot.kwb build breakage

[Holger Brunck]

Hi Prafulla,

On 06/15/2011 09:18 AM, Prafulla Wadaskar wrote:
> 
> 
>> -----Original Message-----
>> From: Holger Brunck [mailto:holger.brunck at keymile.com]
>> Sent: Tuesday, June 14, 2011 12:42 PM
>> To: u-boot at lists.denx.de
>> Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko Schocher
>> Subject: [PATCH 2/2] arm/km: fix u-boot.kwb build breakage
>>
>> commit 010a958b
>> (arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h)
>> breaks building keymile arm targets, when u-boot.kwb tries to
>> generate the binary with mkimage. A simple make <board> or MAKEALL
>> succeeded because it don't try to build the kirwood binary at the end.
>>
>> Due this commit we use the CONFIG_SYS_KWD_CONFIG from the
>> arch-kirkwood/config.h and it was removed from the board config.
>> But it was forgotten to include the header. Now the header is included
>> in km_arm.h. Some other defines were obsolete due to this include,
>> these are also removed in this commit.
>>
>> Signed-off-by: Holger Brunck <holger.brunck at keymile.com>
>> cc: Valentin Longchamp <valentin.longchamp at keymile.com>
>> cc: Prafulla Wadaskar <prafulla at marvell.com>
>> cc: Heiko Schocher <hs at denx.de>
>> ---
>>  include/configs/km/km_arm.h |   30 +++++++-----------------------
>>  include/configs/mgcoge3un.h |    1 +
>>  2 files changed, 8 insertions(+), 23 deletions(-)
>>
>> diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
>> index 20ee6ea..29815be 100644
>> --- a/include/configs/km/km_arm.h
>> +++ b/include/configs/km/km_arm.h
>> @@ -40,15 +40,20 @@
>>   * High Level Configuration Options (easy to change)
>>   */
>>  #define CONFIG_MARVELL
>> -#define CONFIG_ARM926EJS		/* Basic Architecture */
>>  #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
>>  #define CONFIG_KIRKWOOD			/* SOC Family Name */
>> -#define CONFIG_KW88F6281		/* SOC Name */
>>  #define CONFIG_MACH_KM_KIRKWOOD		/* Machine type */
>>
>>  /* include common defines/options for all Keymile boards */
>>  #include "keymile-common.h"
>>
>> +#define CONFIG_KW88F6281		/* SOC Name */
> 
> Why did you moved this from top to here?
> 

Indeed this is unneeded. I fix this and resubmit.

>> +#define CONFIG_CMD_NAND
>> +#define CONFIG_CMD_SF
> 
> I think CONFIG_CMD_XXX should ideally below #include <config_cmd_default.h> and that too in <board_config>.h file.
>

I agree for a single board support, but this is not possible in our approach. We
include config_cmd_default.h in keymile-common.h. And keymile-common.h is valid
for our powerpc and arm boards. In km_arm.h we add the CMD settings which are
only additionaly needed on our arm boards.

> Rest Ack of the patch
>

Ok.

Best regards
Holger