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

diff --combined MAINTAINERS
index 2fc81cfa44f02aebfa23f2e7bfc2f30cf09cde26,36b47b741ad2f63cef57856cd58ff99d4d9b827b..28c052d7a0e32500a400876c6af473f26c9eaa55
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -586,6 -586,7 +586,7 @@@ Stefano Babic <sbabic@denx.de
        trizepsiv       xscale/pxa
        twister         omap3
        vision2         i.MX51
+       woodburn        i.MX35
  
  Lukasz Dalek <luk0104@gmail.com>
  
@@@ -1202,7 -1203,6 +1203,7 @@@ Mark Jonas <mark.jonas@de.bosch.com
  Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
  
        MS7720SE        SH7720
 +      R0P77520000RZ   SH7752
        R0P77570030RL   SH7757
        R0P77850011RL   SH7785
  

diff --combined README
index 1d2e1297d635dfa86134004dd91f7ea62eff2dbb,653ef6aa4a55d57686165e56eeec847dcd40b3f1..78f40dfb5aef64b476b7945166b55542a9f60cc1
--- 1/README
--- 2/README
+++ b/README
@@@ -1486,6 -1486,21 +1486,21 @@@ CBFS (Coreboot Filesystem) suppor
                Normally display is black on white background; define
                CONFIG_SYS_WHITE_ON_BLACK to get it inverted.
  
+               CONFIG_LCD_ALIGNMENT
+ 
+               Normally the LCD is page-aligned (tyically 4KB). If this is
+               defined then the LCD will be aligned to this value instead.
+               For ARM it is sometimes useful to use MMU_SECTION_SIZE
+               here, since it is cheaper to change data cache settings on
+               a per-section basis.
+ 
+               CONFIG_CONSOLE_SCROLL_LINES
+ 
+               When the console need to be scrolled, this is the number of
+               lines to scroll by. It defaults to 1. Increasing this makes
+               the console jump but can help speed up operation when scrolling
+               is slow.
+ 
                CONFIG_LCD_BMP_RLE8
  
                Support drawing of RLE8-compressed bitmaps on the LCD.
@@@ -1495,7 -1510,6 +1510,6 @@@
                Enables an 'i2c edid' command which can read EDID
                information over I2C from an attached LCD display.
  
- 
  - Splash Screen Support: CONFIG_SPLASH_SCREEN
  
                If this option is set, the environment is checked for
@@@ -2390,11 -2404,6 +2404,11 @@@
                CONFIG_SF_DEFAULT_MODE          (see include/spi.h)
                CONFIG_SF_DEFAULT_SPEED         in Hz
  
 +              CONFIG_CMD_SF_TEST
 +
 +              Define this option to include a destructive SPI flash
 +              test ('sf test').
 +
  - SystemACE Support:
                CONFIG_SYSTEMACE
  

diff --combined boards.cfg
index 2acc941de4f1d11b8a1af71bebe35915a980faf7,388e4a4461d2bb6b8403ae7d8730e743197c4bf7..91504c0bc906f12f8c445fa6ecdd4bba1621c7db
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -50,6 -50,8 +50,8 @@@ tt01                         ar
  imx31_litekit                arm         arm1136     -                   logicpd        mx31
  flea3                        arm         arm1136     -                   CarMediaLab    mx35
  mx35pdk                      arm         arm1136     -                   freescale      mx35
+ woodburn                     arm         arm1136     -                   -              mx35
+ woodburn_sd                  arm         arm1136     woodburn            -              mx35        woodburn_sd:IMX_CONFIG=board/woodburn/imximage.cfg
  omap2420h4                   arm         arm1136     -                   ti             omap24xx
  tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
  rpi_b                        arm         arm1176     rpi_b               raspberrypi    bcm2835
@@@ -373,8 -375,8 +375,8 @@@ M5235EVB                     m68
  M5235EVB_Flash32             m68k        mcf523x     m5235evb            freescale      -           M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000
  cobra5272                    m68k        mcf52x2     cobra5272           -
  idmr                         m68k        mcf52x2
 -eb_cpu5282                   m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xFF000000
 -eb_cpu5282_internal          m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xF0000000
 +eb_cpu5282                   m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400
 +eb_cpu5282_internal          m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418
  TASREG                       m68k        mcf52x2     tasreg              esd
  M5208EVBE                    m68k        mcf52x2     m5208evbe           freescale
  M5249EVB                     m68k        mcf52x2     m5249evb            freescale
@@@ -1089,7 -1091,6 +1091,7 @@@ ecovec                       s
  MigoR                        sh          sh4         MigoR               renesas        -
  r2dplus                      sh          sh4         r2dplus             renesas        -
  r7780mp                      sh          sh4         r7780mp             renesas        -
 +sh7752evb                    sh          sh4         sh7752evb           renesas        -
  sh7757lcr                    sh          sh4         sh7757lcr           renesas        -
  sh7763rdp                    sh          sh4         sh7763rdp           renesas        -
  sh7785lcr                    sh          sh4         sh7785lcr           renesas        -