Patchwork [U-Boot,v2,09/16] ARM: remove broken "versatile" boards.

login
register
mail settings
Submitter Wolfgang Denk
Date Aug. 26, 2011, 12:25 p.m.
Message ID <1314361548-18566-10-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/111759/
State Rejected
Delegated to: Albert ARIBAUD
Headers show

Comments

Wolfgang Denk - Aug. 26, 2011, 12:25 p.m.
Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 MAINTAINERS                                |    2 -
 MAKEALL                                    |    3 -
 README                                     |    2 +-
 board/armltd/versatile/Makefile            |   51 ------
 board/armltd/versatile/lowlevel_init.S     |   34 ----
 board/armltd/versatile/split_by_variant.sh |   42 -----
 board/armltd/versatile/versatile.c         |  111 ------------
 doc/README.scrapyard                       |    1 +
 include/configs/versatile.h                |  252 ----------------------------
 9 files changed, 2 insertions(+), 496 deletions(-)
 delete mode 100644 board/armltd/versatile/Makefile
 delete mode 100644 board/armltd/versatile/lowlevel_init.S
 delete mode 100755 board/armltd/versatile/split_by_variant.sh
 delete mode 100644 board/armltd/versatile/versatile.c
 delete mode 100644 include/configs/versatile.h
Stefano Babic - Aug. 26, 2011, 12:56 p.m.
On 08/26/2011 02:25 PM, Wolfgang Denk wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  MAINTAINERS                                |    2 -
>  MAKEALL                                    |    3 -
>  README                                     |    2 +-
>  board/armltd/versatile/Makefile            |   51 ------
>  board/armltd/versatile/lowlevel_init.S     |   34 ----
>  board/armltd/versatile/split_by_variant.sh |   42 -----
>  board/armltd/versatile/versatile.c         |  111 ------------
>  doc/README.scrapyard                       |    1 +
>  include/configs/versatile.h                |  252 ----------------------------
>  9 files changed, 2 insertions(+), 496 deletions(-)
>  delete mode 100644 board/armltd/versatile/Makefile
>  delete mode 100644 board/armltd/versatile/lowlevel_init.S
>  delete mode 100755 board/armltd/versatile/split_by_variant.sh
>  delete mode 100644 board/armltd/versatile/versatile.c
>  delete mode 100644 include/configs/versatile.h

Hi Wolfgang,

your patch removes also the possibility to run the versatilepb board in
qemu environment (target versatileqemu in boards.cfg). For that I sent a
patch that it is already in mainline (commit
d388298a59ba375c76597b8f95b560afa971a0fb).

I will suggest to remove only the split_by_variant.sh file in this patch.

Best regards,
Stefano Babic
Albert ARIBAUD - Aug. 30, 2011, 6:47 a.m.
Hi Stefano,

Le 26/08/2011 14:56, Stefano Babic a écrit :
> On 08/26/2011 02:25 PM, Wolfgang Denk wrote:
>> Signed-off-by: Wolfgang Denk<wd@denx.de>
>> ---
>>   MAINTAINERS                                |    2 -
>>   MAKEALL                                    |    3 -
>>   README                                     |    2 +-
>>   board/armltd/versatile/Makefile            |   51 ------
>>   board/armltd/versatile/lowlevel_init.S     |   34 ----
>>   board/armltd/versatile/split_by_variant.sh |   42 -----
>>   board/armltd/versatile/versatile.c         |  111 ------------
>>   doc/README.scrapyard                       |    1 +
>>   include/configs/versatile.h                |  252 ----------------------------
>>   9 files changed, 2 insertions(+), 496 deletions(-)
>>   delete mode 100644 board/armltd/versatile/Makefile
>>   delete mode 100644 board/armltd/versatile/lowlevel_init.S
>>   delete mode 100755 board/armltd/versatile/split_by_variant.sh
>>   delete mode 100644 board/armltd/versatile/versatile.c
>>   delete mode 100644 include/configs/versatile.h
>
> Hi Wolfgang,
>
> your patch removes also the possibility to run the versatilepb board in
> qemu environment (target versatileqemu in boards.cfg). For that I sent a
> patch that it is already in mainline (commit
> d388298a59ba375c76597b8f95b560afa971a0fb).
>
> I will suggest to remove only the split_by_variant.sh file in this patch.

Building all versatile boards here with ELDK4.2 on a Natty Ubuntu, I get 
warnings of two sorts:

1) in the QEMU build, you needlessly cast a pointer as 'volatile', which 
I missed on review but which my compiler does not like -- I did a 
general removal patch for code in U-Boot that calls get_ram_size() with 
a volatile-cast argument.

2) There are a lot of redefinitions, apparently a double include.

Can you look into this?

uboot@lilith:~/src/u-boot-arm$ ./MAKEALL versatileqemu versatilepb 
versatileab
Configuring for versatileqemu - Board: versatile, Options: 
ARCH_VERSATILE_QEMU
versatile.c: In function 'dram_init':
versatile.c:98: warning: passing argument 1 of 'get_ram_size' discards 
qualifiers from pointer target type
    text    data     bss     dec     hex filename
  100896    2140   12020  115056   1c170 ./u-boot
Configuring for versatilepb - Board: versatile, Options: ARCH_VERSATILE_PB
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from include/common.h:37:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from include/common.h:37:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from include/common.h:41:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from include/common.h:37:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from lib/asm-offsets.c:18:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from lib/asm-offsets.c:18:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from lib/asm-offsets.c:18:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from lib/asm-offsets.c:18:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from hello_world.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from hello_world.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from hello_world.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from hello_world.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from smc91111_eeprom.c:30:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from smc91111_eeprom.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from smc91111_eeprom.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from smc91111_eeprom.c:30:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from /home/uboot/src/u-boot-arm/include/exports.h:6,
                  from stubs.c:1:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from /home/uboot/src/u-boot-arm/include/exports.h:6,
                  from stubs.c:1:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from /home/uboot/src/u-boot-arm/include/exports.h:6,
                  from stubs.c:1:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from /home/uboot/src/u-boot-arm/include/exports.h:6,
                  from stubs.c:1:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from start.S:35:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from start.S:35:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cpu.c:32:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cpu.c:32:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cpu.c:32:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cpu.c:32:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from part.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from part.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from part.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from part.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from timer.c:38:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from timer.c:38:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from timer.c:38:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from timer.c:38:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from board.c:41:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from board.c:41:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from board.c:41:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from board.c:41:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from bootm.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from bootm.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from bootm.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from bootm.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cache.c:26:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cache.c:26:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cache.c:26:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cache.c:26:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cache-cp15.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cache-cp15.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cache-cp15.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cache-cp15.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from interrupts.c:38:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from interrupts.c:38:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from interrupts.c:38:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from interrupts.c:38:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from reset.c:40:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from reset.c:40:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from reset.c:40:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from reset.c:40:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from eabi_compat.c:12:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from eabi_compat.c:12:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from eabi_compat.c:12:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from eabi_compat.c:12:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cfi_flash.c:37:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cfi_flash.c:37:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cfi_flash.c:37:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cfi_flash.c:37:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_bdinfo.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_bdinfo.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_bdinfo.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_bdinfo.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_boot.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_boot.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_boot.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_boot.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_bootm.c:28:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_bootm.c:28:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_bootm.c:28:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_bootm.c:28:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_flash.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_flash.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_flash.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_flash.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from smc91111.c:62:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from smc91111.c:62:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from smc91111.c:62:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from smc91111.c:62:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_help.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_help.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_help.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_help.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_load.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_load.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_load.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_load.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_mem.c:30:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_mem.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_mem.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_mem.c:30:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_net.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_net.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_net.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_net.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from rpx_pcmcia.c:4:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from rpx_pcmcia.c:4:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from rpx_pcmcia.c:4:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from rpx_pcmcia.c:4:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_nvedit.c:43:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_nvedit.c:43:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_nvedit.c:43:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_nvedit.c:43:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from tqm8xx_pcmcia.c:5:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from tqm8xx_pcmcia.c:5:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from tqm8xx_pcmcia.c:5:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from tqm8xx_pcmcia.c:5:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from date.c:28:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from date.c:28:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_pcmcia.c:56:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_pcmcia.c:56:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from date.c:28:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from date.c:28:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_pcmcia.c:56:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_pcmcia.c:56:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_version.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_version.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from cmd_version.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from cmd_version.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from command.c:28:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from command.c:28:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from command.c:28:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from command.c:28:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from console.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from console.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from console.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from console.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from serial_pl01x.c:30:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from serial_pl01x.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from serial_pl01x.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from serial_pl01x.c:30:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from dlmalloc.c:1:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from dlmalloc.c:1:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from dlmalloc.c:1:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from dlmalloc.c:1:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from env_common.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from env_common.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from env_common.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from env_common.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from env_flash.c:29:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from env_flash.c:29:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from env_flash.c:29:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from env_flash.c:29:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from exports.c:1:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from exports.c:1:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from exports.c:1:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from exports.c:1:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from flash.c:26:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from flash.c:26:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from flash.c:26:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from flash.c:26:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from image.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from image.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from image.c:27:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from image.c:27:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from main.c:30:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from main.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from main.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from main.c:30:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from memsize.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from memsize.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from s_record.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from s_record.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from s_record.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from s_record.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from stdio.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from stdio.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from stdio.c:25:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from stdio.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from xyzModem.c:57:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from xyzModem.c:57:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from xyzModem.c:57:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from xyzModem.c:57:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from env_embedded.c:28:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from env_embedded.c:28:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/compiler.h:110,
                  from /home/uboot/src/u-boot-arm/include/environment.h:133,
                  from env_embedded.c:30:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from env_embedded.c:28:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from zlib.h:5,
                  from zutil.h:17,
                  from zlib.c:15:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from zlib.h:5,
                  from zutil.h:17,
                  from zlib.c:15:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from zlib.h:5,
                  from zutil.h:17,
                  from zlib.c:15:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from zlib.h:5,
                  from zutil.h:17,
                  from zlib.c:15:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from bootp.c:11:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from bootp.c:11:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from bootp.c:11:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from bootp.c:11:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from eth.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from eth.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from eth.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from eth.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from net.c:77:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from net.c:77:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from net.c:77:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from net.c:77:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from crc32.c:12:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from crc32.c:12:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from crc32.c:12:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from crc32.c:12:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from tftp.c:9:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from tftp.c:9:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from tftp.c:9:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from tftp.c:9:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from display_options.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from display_options.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from display_options.c:25:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from display_options.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from gunzip.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from gunzip.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from gunzip.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from gunzip.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from hashtable.c:44:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from hashtable.c:44:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from hashtable.c:44:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from hashtable.c:44:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from lmb.c:13:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from lmb.c:13:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from lmb.c:13:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from lmb.c:13:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from net_utils.c:29:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from net_utils.c:29:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from net_utils.c:29:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from net_utils.c:29:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from /home/uboot/src/u-boot-arm/include/exports.h:6,
                  from qsort.c:19:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from /home/uboot/src/u-boot-arm/include/exports.h:6,
                  from qsort.c:19:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from /home/uboot/src/u-boot-arm/include/exports.h:6,
                  from qsort.c:19:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from /home/uboot/src/u-boot-arm/include/exports.h:6,
                  from qsort.c:19:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from strmhz.c:23:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from strmhz.c:23:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from strmhz.c:23:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from strmhz.c:23:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from string.c:19:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from string.c:19:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from time.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from time.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from time.c:24:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from time.c:24:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from vsprintf.c:14:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from vsprintf.c:14:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from vsprintf.c:18:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from vsprintf.c:14:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from versatile.c:36:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from versatile.c:36:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
In file included from /home/uboot/src/u-boot-arm/include/asm/string.h:4,
                  from /home/uboot/src/u-boot-arm/include/linux/string.h:21,
                  from /home/uboot/src/u-boot-arm/include/common.h:41,
                  from versatile.c:36:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from /home/uboot/src/u-boot-arm/include/common.h:37,
                  from versatile.c:36:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
this is the location of the previous definition
versatile.c: In function 'dram_init':
versatile.c:98: warning: passing argument 1 of 'get_ram_size' discards 
qualifiers from pointer target type
In file included from /home/uboot/src/u-boot-arm/include/config.h:6,
                  from lowlevel_init.S:26:
/home/uboot/src/u-boot-arm/include/configs/versatile.h:43:1: warning: 
"CONFIG_ARCH_VERSATILE_PB" redefined
In file included from lowlevel_init.S:26:
/home/uboot/src/u-boot-arm/include/config.h:2:1: warning: this is the 
location of the previous definition
    text    data     bss     dec     hex filename
  116776    2196   13384  132356   20504 ./u-boot
Configuring for versatileab - Board: versatile, Options: ARCH_VERSATILE_AB
versatile.c: In function 'dram_init':
versatile.c:98: warning: passing argument 1 of 'get_ram_size' discards 
qualifiers from pointer target type
    text    data     bss     dec     hex filename
  116800    2196   14684  133680   20a30 ./u-boot

--------------------- SUMMARY ----------------------------
Boards compiled: 3
Boards with warnings or errors: 3 ( versatileqemu versatilepb versatileab )
----------------------------------------------------------
uboot@lilith:~/src/u-boot-arm$

> Best regards,
> Stefano Babic

Amicalement,
Stefano Babic - Aug. 30, 2011, 7:16 a.m.
On 08/30/2011 08:47 AM, Albert ARIBAUD wrote:
> Hi Stefano,

Hi Albert,

> Building all versatile boards here with ELDK4.2 on a Natty Ubuntu, I get
> warnings of two sorts:
> 
> 1) in the QEMU build, you needlessly cast a pointer as 'volatile',

This is wrong...

> which
> I missed on review but which my compiler does not like -- I did a
> general removal patch for code in U-Boot that calls get_ram_size() with
> a volatile-cast argument.

I saw the same issue rebuilding all IMX board for the scb9328 - because
this was the only board with this warning I found, I sent a patch for it
and I have already applied to u-boot-imx. I sent to you a "pull
request", but let me know if you prefer I drop my patch from u-boot-imx
before you merge into u-boot-arm.

> 
> 2) There are a lot of redefinitions, apparently a double include.
> 
> Can you look into this?
> 
> uboot@lilith:~/src/u-boot-arm$ ./MAKEALL versatileqemu versatilepb
> versatileab

Ok, that is clear. I tested only with qemu, because I have not the real
 board.

> Configuring for versatileqemu - Board: versatile, Options:
> ARCH_VERSATILE_QEMU
> versatile.c: In function 'dram_init':
> versatile.c:98: warning: passing argument 1 of 'get_ram_size' discards
> qualifiers from pointer target type
>    text    data     bss     dec     hex filename
>  100896    2140   12020  115056   1c170 ./u-boot
> Configuring for versatilepb - Board: versatile, Options: ARCH_VERSATILE_PB

Yes, it is redefined. I will send the patch, I will test the board
running in the qemu environment.

Best regards,
Stefano
Albert ARIBAUD - Aug. 30, 2011, 8:16 a.m.
Le 30/08/2011 09:16, Stefano Babic a écrit :

> On 08/30/2011 08:47 AM, Albert ARIBAUD wrote:
>> Hi Stefano,
>
> Hi Albert,
>
>> Building all versatile boards here with ELDK4.2 on a Natty Ubuntu, I get
>> warnings of two sorts:
>>
>> 1) in the QEMU build, you needlessly cast a pointer as 'volatile',
>
> This is wrong...
>
>> which
>> I missed on review but which my compiler does not like -- I did a
>> general removal patch for code in U-Boot that calls get_ram_size() with
>> a volatile-cast argument.
>
> I saw the same issue rebuilding all IMX board for the scb9328 - because
> this was the only board with this warning I found, I sent a patch for it
> and I have already applied to u-boot-imx. I sent to you a "pull
> request", but let me know if you prefer I drop my patch from u-boot-imx
> before you merge into u-boot-arm.

I'll pick it with the IMX pull req, and I will apply Wolfgang's patch 
set afterward, minus versatile if the board is completely fixed.

Amicalement,
Albert ARIBAUD - Aug. 30, 2011, 8:24 a.m.
Stefano,

Le 30/08/2011 10:16, Albert ARIBAUD a écrit :
> Le 30/08/2011 09:16, Stefano Babic a écrit :
>
>> On 08/30/2011 08:47 AM, Albert ARIBAUD wrote:
>>> Hi Stefano,
>>
>> Hi Albert,
>>
>>> Building all versatile boards here with ELDK4.2 on a Natty Ubuntu, I get
>>> warnings of two sorts:
>>>
>>> 1) in the QEMU build, you needlessly cast a pointer as 'volatile',
>>
>> This is wrong...
>>
>>> which
>>> I missed on review but which my compiler does not like -- I did a
>>> general removal patch for code in U-Boot that calls get_ram_size() with
>>> a volatile-cast argument.
>>
>> I saw the same issue rebuilding all IMX board for the scb9328 - because
>> this was the only board with this warning I found, I sent a patch for it
>> and I have already applied to u-boot-imx. I sent to you a "pull
>> request", but let me know if you prefer I drop my patch from u-boot-imx
>> before you merge into u-boot-arm.
>
> I'll pick it with the IMX pull req, and I will apply Wolfgang's patch
> set afterward, minus versatile if the board is completely fixed.

Sorry, I realize there might have been a misunderstanding. The global 
fix patch I did was applied some time ago and any spurious volatile left 
must be fixed by new patches, so your patch is welcome anyway.

Note that you also need to provide a fix for versatile.c.

Amicalement,

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 4927d4b..4de0231 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -545,8 +545,6 @@  Unknown / orphaned boards:
 	EVB64260	MPC7xx_74xx
 
 	integratorcp	various
-	versatile	ARM926EJ-S
-	versatile	ARM926EJ-S
 
 
 #########################################################################
diff --git a/MAKEALL b/MAKEALL
index 73a053d..d6d04b7 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -346,9 +346,6 @@  LIST_ARM9="			\
 	spear320		\
 	spear600		\
 	VCMA9			\
-	versatile		\
-	versatileab		\
-	versatilepb		\
 	voiceblue		\
 	davinci_dvevm		\
 	davinci_schmoogie	\
diff --git a/README b/README
index 0886987..d3bcb14 100644
--- a/README
+++ b/README
@@ -532,7 +532,7 @@  The following options need to be configured:
 
 		If you have Amba PrimeCell PL010 or PL011 UARTs on your board,
 		define this to a list of base addresses for each (supported)
-		port. See e.g. include/configs/versatile.h
+		port.
 
 		CONFIG_PL011_SERIAL_RLCR
 
diff --git a/board/armltd/versatile/Makefile b/board/armltd/versatile/Makefile
deleted file mode 100644
index 3470328..0000000
--- a/board/armltd/versatile/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@ 
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)lib$(BOARD).o
-
-COBJS	:= versatile.o
-SOBJS	:= lowlevel_init.o
-
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-SOBJS	:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
-	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
-
-clean:
-	rm -f $(SOBJS) $(OBJS)
-
-distclean:	clean
-	rm -f $(LIB) core *.bak $(obj).depend
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/armltd/versatile/lowlevel_init.S b/board/armltd/versatile/lowlevel_init.S
deleted file mode 100644
index bdfce2d..0000000
--- a/board/armltd/versatile/lowlevel_init.S
+++ /dev/null
@@ -1,34 +0,0 @@ 
-/*
- * Board specific setup info
- *
- * (C) Copyright 2003, ARM Ltd.
- * Philippe Robin, <philippe.robin@arm.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <config.h>
-#include <version.h>
-
-/* Set up the platform, once the cpu has been initialized */
-.globl lowlevel_init
-lowlevel_init:
-
-	/* All done by Versatile's boot monitor! */
-	mov pc, lr
diff --git a/board/armltd/versatile/split_by_variant.sh b/board/armltd/versatile/split_by_variant.sh
deleted file mode 100755
index 475e5a3..0000000
--- a/board/armltd/versatile/split_by_variant.sh
+++ /dev/null
@@ -1,42 +0,0 @@ 
-#!/bin/sh
-# ---------------------------------------------------------
-#  Set the core module defines according to Core Module
-# ---------------------------------------------------------
-# ---------------------------------------------------------
-# Set up the Versatile type define
-# ---------------------------------------------------------
-
-mkdir -p ${obj}include
-variant=PB926EJ-S
-if [ "$1" = "" ]
-then
-	echo "$0:: No parameters - using versatilepb_config"
-	echo "#define CONFIG_ARCH_VERSATILE_PB" > ${obj}include/config.h
-	variant=PB926EJ-S
-else
-	case "$1" in
-	versatilepb_config	|	\
-	versatile_config)
-	echo "#define CONFIG_ARCH_VERSATILE_PB" > ${obj}include/config.h
-	;;
-
-	versatileab_config)
-	echo "#define CONFIG_ARCH_VERSATILE_AB" > ${obj}include/config.h
-	variant=AB926EJ-S
-	;;
-
-
-	*)
-	echo "$0:: Unrecognised config - using versatilepb_config"
-	echo "#define CONFIG_ARCH_VERSATILE_PB" > ${obj}include/config.h
-	variant=PB926EJ-S
-	;;
-
-	esac
-
-fi
-# ---------------------------------------------------------
-# Complete the configuration
-# ---------------------------------------------------------
-$MKCONFIG -a versatile arm arm926ejs versatile armltd versatile
-echo "Variant:: $variant"
diff --git a/board/armltd/versatile/versatile.c b/board/armltd/versatile/versatile.c
deleted file mode 100644
index ee8cb5e..0000000
--- a/board/armltd/versatile/versatile.c
+++ /dev/null
@@ -1,111 +0,0 @@ 
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
- *
- * (C) Copyright 2003
- * Texas Instruments, <www.ti.com>
- * Kshitij Gupta <Kshitij@ti.com>
- *
- * (C) Copyright 2004
- * ARM Ltd.
- * Philippe Robin, <philippe.robin@arm.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <netdev.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_SHOW_BOOT_PROGRESS)
-void show_boot_progress(int progress)
-{
-    printf("Boot reached stage %d\n", progress);
-}
-#endif
-
-#define COMP_MODE_ENABLE ((unsigned int)0x0000EAEF)
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-
-int board_early_init_f (void)
-{
-	/*
-	 * set clock frequency:
-	 *	VERSATILE_REFCLK is 32KHz
-	 *	VERSATILE_TIMCLK is 1MHz
-	 */
-	*(volatile unsigned int *)(VERSATILE_SCTL_BASE) |=
-	  ((VERSATILE_TIMCLK << VERSATILE_TIMER1_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER2_EnSel) |
-	   (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel));
-
-	return 0;
-}
-
-int board_init (void)
-{
-	/* arch number of Versatile Board */
-	gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
-
-	/* adress of boot parameters */
-	gd->bd->bi_boot_params = 0x00000100;
-
-	gd->flags = 0;
-
-	icache_enable ();
-
-	return 0;
-}
-
-
-int misc_init_r (void)
-{
-	setenv("verify", "n");
-	return (0);
-}
-
-/******************************
- Routine:
- Description:
-******************************/
-int dram_init (void)
-{
-	/* dram_init must store complete ramsize in gd->ram_size */
-	gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
-				PHYS_SDRAM_1_SIZE);
-	return 0;
-}
-
-#ifdef CONFIG_CMD_NET
-int board_eth_init(bd_t *bis)
-{
-	int rc = 0;
-#ifdef CONFIG_SMC91111
-	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
-#endif
-	return rc;
-}
-#endif
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index 19bd1d6..087e0e1 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -11,6 +11,7 @@  easily if here is something they might want to dig for...
 
 Board	Arch	CPU	removed	    Commit	last known maintainer/contact
 =============================================================================
+versatile arm	ARM926EJS -	  2011-07-17	Peter Pearse <peter.pearse@arm.com>
 smdk2400 arm	arm920t	-	  2011-07-17	Gary Jennejohn <garyj@denx.de>
 sbc2410x arm	arm920t	-	  2011-07-17
 netstar	arm	arm925t	-	  2011-07-17
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
deleted file mode 100644
index 32cee82..0000000
--- a/include/configs/versatile.h
+++ /dev/null
@@ -1,252 +0,0 @@ 
-/*
- * (C) Copyright 2003
- * Texas Instruments.
- * Kshitij Gupta <kshitij@ti.com>
- * Configuation settings for the TI OMAP Innovator board.
- *
- * (C) Copyright 2004
- * ARM Ltd.
- * Philippe Robin, <philippe.robin@arm.com>
- * Configuration for Versatile PB.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_ARM926EJS	1	/* This is an arm926ejs CPU core */
-#define CONFIG_VERSATILE	1	/* in Versatile Platform Board	*/
-#define CONFIG_ARCH_VERSATILE	1	/* Specifically, a Versatile	*/
-
-#ifndef CONFIG_ARCH_VERSATILE_AB	/* AB				*/
-#define CONFIG_ARCH_VERSATILE_PB	/* Versatile PB is default	*/
-#endif
-
-#define CONFIG_SYS_MEMTEST_START	0x100000
-#define CONFIG_SYS_MEMTEST_END		0x10000000
-#define CONFIG_SYS_HZ			(1000000 / 256)
-#define CONFIG_SYS_TIMERBASE		0x101E2000	/* Timer 0 and 1 base */
-
-#define CONFIG_SYS_TIMER_INTERVAL	10000
-#define CONFIG_SYS_TIMER_RELOAD		(CONFIG_SYS_TIMER_INTERVAL >> 4)
-#define CONFIG_SYS_TIMER_CTRL		0x84		/* Enable, Clock / 16 */
-
-/*
- * control registers
- */
-#define VERSATILE_SCTL_BASE		0x101E0000	/* System controller */
-
-/*
- * System controller bit assignment
- */
-#define VERSATILE_REFCLK	0
-#define VERSATILE_TIMCLK	1
-
-#define VERSATILE_TIMER1_EnSel	15
-#define VERSATILE_TIMER2_EnSel	17
-#define VERSATILE_TIMER3_EnSel	19
-#define VERSATILE_TIMER4_EnSel	21
-
-#define CONFIG_CMDLINE_TAG		1	/* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS	1
-#define CONFIG_MISC_INIT_R		1
-/*
- * Size of malloc() pool
- */
-#define CONFIG_ENV_SIZE			8192
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
-
-/*
- * Hardware drivers
- */
-
-#define CONFIG_NET_MULTI
-#define CONFIG_SMC91111
-#define CONFIG_SMC_USE_32_BIT
-#define CONFIG_SMC91111_BASE	0x10010000
-#undef CONFIG_SMC91111_EXT_PHY
-
-/*
- * NS16550 Configuration
- */
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL011_CLOCK	24000000
-#define CONFIG_PL01x_PORTS				\
-			{(void *)CONFIG_SYS_SERIAL0,	\
-			 (void *)CONFIG_SYS_SERIAL1 }
-#define CONFIG_CONS_INDEX	0
-
-#define CONFIG_BAUDRATE			38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-#define CONFIG_SYS_SERIAL0		0x101F1000
-#define CONFIG_SYS_SERIAL1		0x101F2000
-
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_SUBNETMASK
-
-#define CONFIG_BOOTDELAY	2
-#define CONFIG_BOOTARGS		"root=/dev/nfs mem=128M ip=dhcp "\
-				"netdev=25,0,0xf1010000,0xf1010010,eth0"
-
-/*
- * Static configuration when assigning fixed address
- */
-#define CONFIG_BOOTFILE		"/tftpboot/uImage" /* file to load */
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-/* Monitor Command Prompt	 */
-#ifdef CONFIG_ARCH_VERSATILE_AB
-# define CONFIG_SYS_PROMPT	"VersatileAB # "
-#else
-# define CONFIG_SYS_PROMPT	"VersatilePB # "
-#endif
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE	\
-			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS	16		/* max number of command args */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
-
-#define CONFIG_SYS_LOAD_ADDR	0x7fc0	/* default load address */
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE	(128 * 1024)	/* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ	(4 * 1024)	/* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ	(4 * 1024)	/* FIQ stack */
-#endif
-
-/*-----------------------------------------------------------------------
- * Physical Memory Map
- */
-#define CONFIG_NR_DRAM_BANKS	1	/* we have 1 bank of DRAM */
-#define PHYS_SDRAM_1		0x00000000	/* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE	0x08000000	/* 128 MB */
-#define PHYS_FLASH_SIZE		0x04000000	/* 64MB */
-
-#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_RAM_ADDR	0x00800000
-#define CONFIG_SYS_INIT_RAM_SIZE	0x000FFFFF
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - \
-						GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_INIT_RAM_ADDR + \
-						CONFIG_SYS_GBL_DATA_OFFSET)
-
-#define CONFIG_BOARD_EARLY_INIT_F
-
-/*-----------------------------------------------------------------------
- * FLASH and environment organization
- */
-#ifdef CONFIG_ARCH_VERSATILE_QEMU
-#define CONFIG_SYS_TEXT_BASE		0x10000
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_SYS_MONITOR_LEN		0x80000
-#else
-#define CONFIG_SYS_TEXT_BASE		0x01000000
-/*
- * Use the CFI flash driver for ease of use
- */
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_ENV_IS_IN_FLASH	1
-/*
- *	System control register
- */
-#define VERSATILE_SYS_BASE		0x10000000
-#define VERSATILE_SYS_FLASH_OFFSET	0x4C
-#define VERSATILE_FLASHCTRL		\
-		(VERSATILE_SYS_BASE + VERSATILE_SYS_FLASH_OFFSET)
-/* Enable writing to flash */
-#define VERSATILE_FLASHPROG_FLVPPEN	(1 << 0)
-
-/* timeout values are in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT	(2 * CONFIG_SYS_HZ) /* Erase Timeout */
-#define CONFIG_SYS_FLASH_WRITE_TOUT	(2 * CONFIG_SYS_HZ) /* Write Timeout */
-
-/*
- * Note that CONFIG_SYS_MAX_FLASH_SECT allows for a parameter block
- * i.e.
- *	the bottom "sector" (bottom boot), or top "sector"
- *	(top boot), is a seperate erase region divided into
- *	4 (equal) smaller sectors. This, notionally, allows
- *	quicker erase/rewrire of the most frequently changed
- *	area......
- *	CONFIG_SYS_MAX_FLASH_SECT is padded up to a multiple of 4
- */
-
-#ifdef CONFIG_ARCH_VERSATILE_AB
-#define FLASH_SECTOR_SIZE		0x00020000	/* 128 KB sectors */
-#define CONFIG_ENV_SECT_SIZE		(2 * FLASH_SECTOR_SIZE)
-#define CONFIG_SYS_MAX_FLASH_SECT	(520)
-#endif
-
-#ifdef CONFIG_ARCH_VERSATILE_PB		/* Versatile PB is default	*/
-#define FLASH_SECTOR_SIZE		0x00040000	/* 256 KB sectors */
-#define CONFIG_ENV_SECT_SIZE		FLASH_SECTOR_SIZE
-#define CONFIG_SYS_MAX_FLASH_SECT	(260)
-#endif
-
-#define CONFIG_SYS_FLASH_BASE		0x34000000
-#define CONFIG_SYS_MAX_FLASH_BANKS	1
-
-#define CONFIG_SYS_MONITOR_LEN		(4 * CONFIG_ENV_SECT_SIZE)
-
-/* The ARM Boot Monitor is shipped in the lowest sector of flash */
-
-#define FLASH_TOP			(CONFIG_SYS_FLASH_BASE + PHYS_FLASH_SIZE)
-#define CONFIG_ENV_ADDR			(FLASH_TOP - CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_OFFSET		(CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
-#define CONFIG_SYS_MONITOR_BASE		(CONFIG_ENV_ADDR - CONFIG_SYS_MONITOR_LEN)
-
-#define CONFIG_SYS_FLASH_PROTECTION	/* The devices have real protection */
-#define CONFIG_SYS_FLASH_EMPTY_INFO	/* flinfo indicates empty blocks */
-
-#endif
-
-#endif	/* __CONFIG_H */