Merge branch 'master' of ../master into next

diff --combined MAINTAINERS
index fc6bae90495201384147b14113e390ba2cf3bd6a,0590ad9d077f36a0d029d3cacc23b7ec3bf2547a..ba874362c98d528c80681a48120b49ee39d25ae9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -310,10 -310,11 +310,11 @@@ Tirumala Marri <tmarri@apm.com
  
        bluestone       APM821XX
  
- Reinhard Meyer <r.meyer@emk-elektronik.de>
+ Reinhard Meyer <reinhard.meyer@emk-elektronik.de>
  
        TOP860          MPC860T
        TOP5200         MPC5200
+       TOP9000         ARM926EJS (AT91SAM9xxx SoC)
  
  Tolunay Orkun <torkun@nextio.com>
  
@@@ -414,7 -415,6 +415,7 @@@ Georg Schardt <schardt@team-ctech.de
  
  Heiko Schocher <hs@denx.de>
  
 +      charon          MPC5200
        ids8247         MPC8247
        jupiter         MPC5200
        kmeter1         MPC8360
@@@ -550,7 -550,6 +551,7 @@@ Rowel Atienza <rowel@diwalabs.com
  
  Stefano Babic <sbabic@denx.de>
  
 +      ea20            davinci
        polaris         xscale
        trizepsiv       xscale
        mx51evk         i.MX51
@@@ -855,11 -854,6 +856,11 @@@ Alex Züpke <azu@sysgo.de
        lart            SA1100
        dnp1110         SA1110
  
 +Syed Mohammed Khasim <sm.khasim@gmail.com>
 +Sughosh Ganu <urwithsughosh@gmail.com>
 +
 +      hawkboard       ARM926EJS (OMAP-L138)
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:

diff --combined boards.cfg
index 6258eb2322cf252a4a9118e0136eacf74c27ff81,dcd5a12347917a43c6ba933e11cd60cc70ab3428..939a82db83e6d895f6a02dc31aa61c95720aaa77
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -48,7 -48,8 +48,8 @@@ lpc2292sodimm                ar
  SMN42                        arm         arm720t     -                   siemens        lpc2292
  evb4510                      arm         arm720t     -                   -              s3c4510b
  a320evb                      arm         arm920t     -                   faraday        a320
- at91rm9200ek                 arm         arm920t     -                   atmel          at91
+ at91rm9200ek                 arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek
+ at91rm9200ek_ram             arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek:RAMBOOT
  eb_cpux9k2                   arm         arm920t     -                   BuS            at91
  cmc_pu2                      arm         arm920t     -                   -              at91rm9200
  csb637                       arm         arm920t     -                   -              at91rm9200
@@@ -70,16 -71,14 +71,18 @@@ voiceblue                    ar
  omap1510inn                  arm         arm925t     -                   ti
  afeb9260                     arm         arm926ejs   -                   -              at91
  at91cap9adk                  arm         arm926ejs   -                   atmel          at91
+ top9000eval_xe               arm         arm926ejs   top9000             emk            at91        top9000:EVAL9000
+ top9000su_xe                 arm         arm926ejs   top9000             emk            at91        top9000:SU9000
  meesc                        arm         arm926ejs   -                   esd            at91
  otc570                       arm         arm926ejs   -                   esd            at91
  pm9261                       arm         arm926ejs   -                   ronetix        at91
  pm9263                       arm         arm926ejs   -                   ronetix        at91
  da830evm                     arm         arm926ejs   da8xxevm            davinci        davinci
  da850evm                     arm         arm926ejs   da8xxevm            davinci        davinci
 +hawkboard                    arm         arm926ejs   da8xxevm            davinci        davinci
 +hawkboard_nand               arm         arm926ejs   da8xxevm            davinci        davinci     hawkboard:NAND_U_BOOT
 +hawkboard_uart               arm         arm926ejs   da8xxevm            davinci        davinci     hawkboard:UART_U_BOOT
 +ea20                       arm         arm926ejs   ea20                davinci        davinci
  davinci_dm355evm             arm         arm926ejs   dm355evm            davinci        davinci
  davinci_dm355leopard         arm         arm926ejs   dm355leopard        davinci        davinci
  davinci_dm365evm             arm         arm926ejs   dm365evm            davinci        davinci
@@@ -294,7 -293,6 +297,7 @@@ pcm030_LOWBOOT               powerp
  aev                          powerpc     mpc5xxx     tqm5200             tqc
  cam5200                      powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:CAM5200,TQM5200S,TQM5200_B
  cam5200_niosflash            powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:CAM5200,TQM5200S,TQM5200_B,CAM5200_NIOSFLASH
 +charon                       powerpc     mpc5xxx     tqm5200             tqc            -           charon
  fo300                        powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:FO300
  MiniFAP                      powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:MINIFAP
  TB5200                       powerpc     mpc5xxx     tqm5200             tqc
@@@ -407,10 -405,10 +410,10 @@@ vme8349                      powerp
  MPC8308RDB                   powerpc     mpc83xx     mpc8308rdb          freescale
  MPC8313ERDB_33               powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ
  MPC8313ERDB_66               powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ
- MPC8313ERDB_NAND_33          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ,NAND_U_BOOT,SYS_TEXT_BASE=0x00100000
- MPC8313ERDB_NAND_66          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ,NAND_U_BOOT,SYS_TEXT_BASE=0x00100000
+ MPC8313ERDB_NAND_33          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ,NAND_U_BOOT
+ MPC8313ERDB_NAND_66          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ,NAND_U_BOOT
  MPC8315ERDB                  powerpc     mpc83xx     mpc8315erdb         freescale      -           MPC8315ERDB
- MPC8315ERDB_NAND             powerpc     mpc83xx     mpc8315erdb         freescale      -           MPC8315ERDB:NAND
+ MPC8315ERDB_NAND             powerpc     mpc83xx     mpc8315erdb         freescale      -           MPC8315ERDB:NAND_U_BOOT
  MPC8323ERDB                  powerpc     mpc83xx     mpc8323erdb         freescale
  MPC832XEMDS                  powerpc     mpc83xx     mpc832xemds         freescale      -           MPC832XEMDS:
  MPC832XEMDS_ATM              powerpc     mpc83xx     mpc832xemds         freescale      -           MPC832XEMDS:PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1

diff --combined include/configs/omap4_sdp4430.h
index bdd330a745a05d7c73546eb0983ecebf069d527f,d2883336b9ac66c860d795d490978b26091f4f4e..9a8bb7334ceb4f8f2d82f92781de2ab28e468c04
--- 1/include/configs/omap4_sdp4430.h
--- 2/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@@ -102,7 -102,6 +102,7 @@@
  
  /* TWL6030 */
  #define CONFIG_TWL6030_POWER          1
 +#define CONFIG_CMD_BAT                        1
  
  /* MMC */
  #define CONFIG_GENERIC_MMC            1
@@@ -140,6 -139,7 +140,7 @@@
  
  /* Disabled commands */
  #undef CONFIG_CMD_NET
+ #undef CONFIG_CMD_NFS
  #undef CONFIG_CMD_FPGA                /* FPGA configuration Support   */
  #undef CONFIG_CMD_IMLS                /* List all found images        */