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

diff --combined MAINTAINERS
index 778d5da71169e315c762a4c759c242104e3e7fa8,22976516e9365c6ba2450ac3524f8e995bc3af39..1bb25218673e0aa8ad63918cc174b0aa1cc273c9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -525,6 -525,12 +525,12 @@@ Dirk Behme <dirk.behme@gmail.com
  
        omap3_beagle    ARM CORTEX-A8 (OMAP3530 SoC)
  
+ Eric Benard <eric@eukrea.com>
+ 
+       cpuat91         ARM920T
+       cpu9260         ARM926EJS (AT91SAM9260 SoC)
+       cpu9G20         ARM926EJS (AT91SAM9G20 SoC)
+ 
  Rishi Bhattacharya <rishi@ti.com>
  
        omap5912osk     ARM926EJS
@@@ -588,6 -594,10 +594,10 @@@ Gary Jennejohn <garyj@denx.de
  Konstantin Kletschke <kletschke@synertronixx.de>
        scb9328         ARM920T
  
+ Simon Kagstrom <simon.kagstrom@netinsight.net>
+ 
+        openrd_base     ARM926EJS (Kirkwood SoC)
+ 
  Nishant Kamat <nskamat@ti.com>
  
        omap1610h2      ARM926EJS
@@@ -725,10 -735,6 +735,10 @@@ Alex Züpke <azu@sysgo.de
        lart            SA1100
        dnp1110         SA1110
  
 +Minkyu Kang <mk7.kang@samsung.com>
 +
 +      SMDKC100        ARM CORTEX-A8 (S5PC100 SoC)
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:

diff --combined MAKEALL
index 8e924d975b694cbf15c580fc5daaa9e49104adfa,38cd0768dcb1f2b75df0b46d06ed87027df704a1..6122e9f52e0810a64384bfe041b272766db5e296
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -549,6 -549,7 +549,7 @@@ LIST_ARM9="                        
        omap1610inn             \
        omap5912osk             \
        omap730p2               \
+       openrd_base             \
        rd6281a                 \
        sbc2410x                \
        scb9328                 \
@@@ -604,7 -605,6 +605,7 @@@ LIST_ARM_CORTEX_A8="               
        omap3_pandora           \
        omap3_zoom1             \
        omap3_zoom2             \
 +      smdkc100                \
  "
  
  #########################################################################
@@@ -619,11 -619,14 +620,14 @@@ LIST_at91="                     
        at91sam9260ek           \
        at91sam9261ek           \
        at91sam9263ek           \
-       at91sam9g10ek   \
+       at91sam9g10ek           \
        at91sam9g20ek           \
        at91sam9m10g45ek        \
        at91sam9rlek            \
        cmc_pu2                 \
+       CPUAT91                 \
+       CPU9260                 \
+       CPU9G20                 \
        csb637                  \
        kb9202                  \
        meesc                   \

diff --combined Makefile
index 042d9a50cf5ac4489ad14fdac5eb93954644f14e,9637643cd5b00b22fe4dbdb2575a864a8cac23a4..1df7e9d8ec7bd50f7101ed9bc7aca2bc63438585
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2691,6 -2691,12 +2691,12 @@@ at91rm9200ek_config   :       unconfi
  cmc_pu2_config        :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
  
+ CPUAT91_RAM_config \
+ CPUAT91_config        :       unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_$(@:_config=) 1"  >$(obj)include/config.h
+       @$(MKCONFIG) -a cpuat91 arm arm920t cpuat91 eukrea at91rm9200
+ 
  csb637_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t csb637 NULL at91rm9200
  
@@@ -2821,6 -2827,14 +2827,14 @@@ at91sam9rlek_config   :       unconfi
        fi;
        @$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91
  
+ CPU9G20_128M_config \
+ CPU9G20_config \
+ CPU9260_128M_config \
+ CPU9260_config        :       unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
+       @$(MKCONFIG) -a cpu9260 arm arm926ejs cpu9260 eukrea at91
+ 
  meesc_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs meesc esd at91
  
@@@ -2976,6 -2990,9 +2990,9 @@@ omap1610h2_cs_autoboot_config:  unconfi
  omap5912osk_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk ti omap
  
+ openrd_base_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
+ 
  xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
  
  omap730p2_config \
@@@ -3127,9 -3144,6 +3144,9 @@@ omap3_zoom1_config :    unconfi
  omap3_zoom2_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
  
 +smdkc100_config:      unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx
 +
  #########################################################################
  ## XScale Systems
  #########################################################################