Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --combined Makefile
index 25a62541d1be50da422866b14f2975a2bb356bee,12224add7c9f22196edb65c291c8d0b391e8cce8..a7ffe2501c923c1c66d71f3bdfb05f23798f8d47
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -140,8 -140,8 +140,8 @@@ endi
  # The "tools" are needed early, so put this first
  # Don't include stuff already done in $(LIBS)
  SUBDIRS       = tools \
 -        examples \
 -        api_examples
 +        examples/standalone \
 +        examples/api
  
  .PHONY : $(SUBDIRS)
  
@@@ -151,10 -151,50 +151,10 @@@ ifeq ($(obj)include/config.mk,$(wildcar
  include $(obj)include/config.mk
  export        ARCH CPU BOARD VENDOR SOC
  
 -ifndef CROSS_COMPILE
 +# set default to nothing for native builds
  ifeq ($(HOSTARCH),$(ARCH))
 -CROSS_COMPILE =
 -else
 -ifeq ($(ARCH),ppc)
 -CROSS_COMPILE = ppc_8xx-
 -endif
 -ifeq ($(ARCH),arm)
 -CROSS_COMPILE = arm-linux-
 -endif
 -ifeq ($(ARCH),i386)
 -CROSS_COMPILE = i386-linux-
 -endif
 -ifeq ($(ARCH),mips)
 -CROSS_COMPILE = mips_4KC-
 -endif
 -ifeq ($(ARCH),nios)
 -CROSS_COMPILE = nios-elf-
 -endif
 -ifeq ($(ARCH),nios2)
 -CROSS_COMPILE = nios2-elf-
 -endif
 -ifeq ($(ARCH),m68k)
 -CROSS_COMPILE = m68k-elf-
 +CROSS_COMPILE ?=
  endif
 -ifeq ($(ARCH),microblaze)
 -CROSS_COMPILE = mb-
 -endif
 -ifeq ($(ARCH),blackfin)
 -CROSS_COMPILE = bfin-uclinux-
 -endif
 -ifeq ($(ARCH),avr32)
 -CROSS_COMPILE = avr32-linux-
 -endif
 -ifeq ($(ARCH),sh)
 -CROSS_COMPILE = sh4-linux-
 -endif
 -ifeq ($(ARCH),sparc)
 -CROSS_COMPILE = sparc-elf-
 -endif # sparc
 -endif # HOSTARCH,ARCH
 -endif # CROSS_COMPILE
 -
 -export        CROSS_COMPILE
  
  # load other configuration
  include $(TOPDIR)/config.mk
@@@ -206,6 -246,7 +206,6 @@@ LIBS += drivers/misc/libmisc.
  LIBS += drivers/mmc/libmmc.a
  LIBS += drivers/mtd/libmtd.a
  LIBS += drivers/mtd/nand/libnand.a
 -LIBS += drivers/mtd/nand_legacy/libnand_legacy.a
  LIBS += drivers/mtd/onenand/libonenand.a
  LIBS += drivers/mtd/ubi/libubi.a
  LIBS += drivers/mtd/spi/libspi_flash.a
@@@ -387,6 -428,7 +387,6 @@@ TAG_SUBDIRS += drivers/mis
  TAG_SUBDIRS += drivers/mmc
  TAG_SUBDIRS += drivers/mtd
  TAG_SUBDIRS += drivers/mtd/nand
 -TAG_SUBDIRS += drivers/mtd/nand_legacy
  TAG_SUBDIRS += drivers/mtd/onenand
  TAG_SUBDIRS += drivers/mtd/spi
  TAG_SUBDIRS += drivers/net
@@@ -656,8 -698,7 +656,8 @@@ o2dnt_config:      unconfi
  
  pcm030_config \
  pcm030_LOWBOOT_config:        unconfig
 -      @ >include/config.h
 +      @mkdir -p $(obj)include $(obj)board/phytec/pcm030
 +      @ >$(obj)include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
                { echo "TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp ; \
                  echo "... with LOWBOOT configuration" ; \
@@@ -2852,6 -2893,9 +2852,9 @@@ lpd7a400_config 
  lpd7a404_config:      unconfig
        @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x
  
+ mv88f6281gtw_ge_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
+ 
  mx1ads_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t mx1ads NULL imx
  
@@@ -2917,12 -2961,18 +2920,18 @@@ omap730p2_cs3boot_config :   unconfi
        fi;
        @$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 NULL omap
  
+ rd6281a_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
+ 
  sbc2410x_config: unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
  
  scb9328_config        :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t scb9328 NULL imx
  
+ sheevaplug_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
+ 
  smdk2400_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t smdk2400 samsung s3c24x0
  
@@@ -3167,7 -3217,6 +3176,6 @@@ omap2420h4_config       : unconfi
  qong_config           : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 qong davedenx mx31
  
- 
  #########################################################################
  ## ARM1176 Systems
  #########################################################################
@@@ -3592,16 -3641,11 +3600,16 @@@ grsim_leon2_config : unconfi
  #########################################################################
  
  clean:
 -      @rm -f $(obj)examples/82559_eeprom $(obj)examples/eepro100_eeprom \
 -             $(obj)examples/hello_world  $(obj)examples/interrupt       \
 -             $(obj)examples/mem_to_mem_idma2intr                        \
 -             $(obj)examples/sched        $(obj)examples/smc91111_eeprom \
 -             $(obj)examples/test_burst   $(obj)examples/timer
 +      @rm -f $(obj)examples/standalone/82559_eeprom                     \
 +             $(obj)examples/standalone/eepro100_eeprom                  \
 +             $(obj)examples/standalone/hello_world                      \
 +             $(obj)examples/standalone/interrupt                        \
 +             $(obj)examples/standalone/mem_to_mem_idma2intr             \
 +             $(obj)examples/standalone/sched                            \
 +             $(obj)examples/standalone/smc91111_eeprom                  \
 +             $(obj)examples/standalone/test_burst                       \
 +             $(obj)examples/standalone/timer
 +      @rm -f $(obj)examples/api/demo{,.bin}
        @rm -f $(obj)tools/bmp_logo        $(obj)tools/easylogo/easylogo  \
               $(obj)tools/env/{fw_printenv,fw_setenv}                    \
               $(obj)tools/envcrc                                         \
@@@ -3618,7 -3662,7 +3626,7 @@@
        @rm -f $(obj)include/bmp_logo.h
        @rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
        @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl-4k.bin,ipl.map}
 -      @rm -f $(obj)api_examples/demo $(TIMESTAMP_FILE) $(VERSION_FILE)
 +      @rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
        @find $(OBJTREE) -type f \
                \( -name 'core' -o -name '*.bak' -o -name '*~' \
                -o -name '*.o'  -o -name '*.a' -o -name '*.exe' \) -print \

diff --combined include/configs/at91cap9adk.h
index 0ef3554216dba8cca9f2cfbb9c0c56787fe11ae1,219eea3114ab68b62ed97082b8974ffd1ecb6b78..27f8fd1a16fb598f2ea1f525ec7ef5d4038457dd
--- 1/include/configs/at91cap9adk.h
--- 2/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@@ -130,10 -130,8 +130,11 @@@
  #define CONFIG_SYS_MAX_NAND_DEVICE            1
  #define CONFIG_SYS_NAND_BASE                  0x40000000
  #define CONFIG_SYS_NAND_DBW_8                 1
+ #endif
  
 +#define CONFIG_SYS_64BIT_VSPRINTF             /* needed for nand_util.c */
 +#endif
 +
  /* Ethernet */
  #define CONFIG_MACB                   1
  #define CONFIG_RMII                   1
@@@ -203,6 -201,7 +204,6 @@@
  #define CONFIG_SYS_LONGHELP           1
  #define CONFIG_CMDLINE_EDITING        1
  
 -#define ROUND(A, B)           (((A) + (B)) & ~((B) - 1))
  /*
   * Size of malloc() pool
   */