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

* 'master' of git://git.denx.de/u-boot-blackfin:
  Blackfin: pata_bfin: fix printf warning
  Blackfin: bfin_nand: mark local func static
  linkage.h: move from blackfin to common includes
  Blackfin: br4: new board port
  Blackfin: add in/out le32 variants
  post: add blackfin to the post_time_ms list
  Blackfin: bf537-stamp: drop board reset workaround
  Blackfin: pr1: new board port

diff --combined MAINTAINERS
index 5f035e0f1c48e70fe968fa4c22b0a828b8319642,2068384f5e1f546d30ac7d9770cdad74b91f760b..1e40af2c8c5e2d850cdbce33ee2c3ba0340b405e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -574,7 -574,6 +574,7 @@@ Stefano Babic <sbabic@denx.de
  
        ea20            davinci
        flea3           i.MX35
 +      mt_ventoux      omap3
        mx35pdk         i.MX35
        mx51evk         i.MX51
        polaris         xscale/pxa
@@@ -678,10 -677,6 +678,10 @@@ Kshitij Gupta <kshitij@ti.com
        omap1510inn     ARM925T
        omap1610inn     ARM926EJS
  
 +Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
 +
 +      dns325          ARM926EJS (Kirkwood SoC)
 +
  Vaibhav Hiremath <hvaibhav@ti.com>
  
        am3517_evm      ARM ARMV7 (AM35x SoC)
@@@ -718,11 -713,6 +718,11 @@@ Chander Kashyap <k.chander@samsung.com
  
        origen                  ARM ARMV7 (EXYNOS4210 SoC)
        SMDKV310                ARM ARMV7 (EXYNOS4210 SoC)
 +      SMDK5250                ARM ARMV7 (EXYNOS5250 SoC)
 +
 +Heungjun Kim <riverful.kim@samsung.com>
 +
 +      trats                   ARM ARMV7 (EXYNOS4210 SoC)
  
  Torsten Koschorrek <koschorrek@synertronixx.de>
        scb9328         ARM920T (i.MXL)
@@@ -806,11 -796,6 +806,11 @@@ Thierry Reding <thierry.reding@avionic-
        plutux          Tegra2 (ARM7 & A9 Dual Core)
        medcom          Tegra2 (ARM7 & A9 Dual Core)
  
 +Christian Riesch <christian.riesch@omicron.at>
 +Manfred Rudigier <manfred.rudigier@omicron.at>
 +
 +      calimain        ARM926EJS (AM1808 SoC)
 +
  Tom Rini <trini@ti.com>
  
        omap3_evm       ARM ARMV7 (OMAP3xx SoC)
@@@ -914,12 -899,10 +914,12 @@@ Tom Warren <twarren@nvidia.com
  Stephen Warren <swarren@nvidia.com>
  
        ventana         Tegra2 (ARM7 & A9 Dual Core)
 +      paz00           Tegra2 (ARM7 & A9 Dual Core)
  
  Thomas Weber <weber@corscience.de>
  
        devkit8000      ARM ARMV7 (OMAP3530 SoC)
 +      tricorder       ARM ARMV7 (OMAP3503 SoC)
  
  Lei Wen <leiwen@marvell.com>
  
@@@ -934,10 -917,6 +934,10 @@@ Richard Woodruff <r-woodruff2@ti.com
  
        omap2420h4      ARM1136EJS
  
 +Ilya Yanok <yanok@emcraft.com>
 +
 +      mcx             ARM ARMV7 (AM35x SoC)
 +
  Syed Mohammed Khasim <sm.khasim@gmail.com>
  Sughosh Ganu <urwithsughosh@gmail.com>
  
@@@ -1183,6 -1162,11 +1183,11 @@@ Chong Huang <chuang@ucrobotics.com
  
        bf525-ucr2      BF525
  
+ Dimitar Penev <dpn@switchfin.org>
+ 
+       BR4 Appliance   BF537
+       PR1 Appliance   BF537
+ 
  #########################################################################
  # NDS32 Systems:                                                      #
  #                                                                     #

diff --combined boards.cfg
index bf71a6650ec665118785526018ef74507df14420,f3209850f9ee0b7cb2403d19fff15842e50b5ab9..05ce1ae06fa37caf1832f13f9d0c9069b12bff05
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -133,10 -133,9 +133,10 @@@ davinci_sffsdr               ar
  davinci_sonata               arm         arm926ejs   sonata              davinci        davinci
  ea20                       arm         arm926ejs   ea20                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
  enbw_cmc                     arm         arm926ejs   enbw_cmc            enbw           davinci
 +calimain                     arm         arm926ejs   calimain            omicron        davinci
 +dns325                       arm         arm926ejs   -                   d-link         kirkwood
  km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood      km_kirkwood:KM_DISABLE_PCI
  km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood      km_kirkwood:KM_RECONFIG_XLX
  mgcoge3un                    arm         arm926ejs   km_arm              keymile        kirkwood
@@@ -178,10 -177,6 +178,10 @@@ omap730p2_cs0boot             arm         arm9
  omap730p2_cs3boot          arm         arm926ejs   omap730p2           ti             omap        omap730p2:CS3_BOOT
  edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
  dkb                        arm         arm926ejs   -                   Marvell        pantheon
 +spear300                     arm         arm926ejs   spear300            spear          spear       spear3xx:spear300
 +spear310                     arm         arm926ejs   spear310            spear          spear       spear3xx:spear310
 +spear320                     arm         arm926ejs   spear320            spear          spear       spear3xx:spear320
 +spear600                     arm         arm926ejs   spear600            spear          spear       spear6xx:spear600
  versatileab                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_AB
  versatilepb                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_PB
  versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
@@@ -207,7 -202,6 +207,7 @@@ dig297                       ar
  igep0020                     arm         armv7       igep0020            isee           omap3
  igep0030                     arm         armv7       igep0030            isee           omap3
  am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
 +mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
  omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
  omap3_zoom2                  arm         armv7       zoom2               logicpd        omap3
  omap3_logic                  arm         armv7       omap3som            logicpd        omap3
@@@ -219,8 -213,6 +219,8 @@@ omap3_evm_quick_mmc          ar
  omap3_evm_quick_nand         arm         armv7       evm                 ti             omap3
  omap3_sdp3430                arm         armv7       sdp3430             ti             omap3
  devkit8000                   arm         armv7       devkit8000          timll          omap3
 +mcx                          arm         armv7       mcx                 htkw           omap3
 +tricorder                    arm         armv7       tricorder           corscience     omap3
  twister                      arm         armv7       twister             technexion     omap3
  omap4_panda                  arm         armv7       panda               ti             omap4
  omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
@@@ -229,9 -221,7 +229,9 @@@ s5p_goni                     ar
  smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
  origen                             arm         armv7       origen              samsung        exynos
  s5pc210_universal            arm         armv7       universal_c210      samsung        exynos
 +smdk5250                   arm         armv7       smdk5250            samsung        exynos
  smdkv310                   arm         armv7       smdkv310            samsung        exynos
 +trats                        arm         armv7       trats               samsung        exynos
  harmony                      arm         armv7       harmony             nvidia         tegra2
  seaboard                     arm         armv7       seaboard            nvidia         tegra2
  ventana                      arm         armv7       ventana             nvidia         tegra2
@@@ -260,7 -250,6 +260,7 @@@ colibri_pxa270               ar
  jornada                      arm         sa1100
  plutux                       arm         armv7       plutux              avionic-design tegra2
  medcom                       arm         armv7       medcom              avionic-design tegra2
 +paz00                        arm         armv7       paz00               compal         tegra2
  atngw100                     avr32       at32ap      -                   atmel          at32ap700x
  atstk1002                    avr32       at32ap      atstk1000           atmel          at32ap700x
  atstk1003                    avr32       at32ap      atstk1000           atmel          at32ap700x
@@@ -291,6 -280,7 +291,7 @@@ bf561-acvilon                blackfi
  bf561-ezkit                  blackfin    blackfin
  blackstamp                   blackfin    blackfin
  blackvme                     blackfin    blackfin
+ br4                          blackfin    blackfin
  cm-bf527                     blackfin    blackfin
  cm-bf533                     blackfin    blackfin
  cm-bf537e                    blackfin    blackfin
@@@ -300,6 -290,7 +301,7 @@@ cm-bf561                     blackfi
  dnp5370                      blackfin    blackfin
  ibf-dsp561                   blackfin    blackfin
  ip04                         blackfin    blackfin
+ pr1                          blackfin    blackfin
  tcm-bf518                    blackfin    blackfin
  tcm-bf537                    blackfin    blackfin
  M52277EVB                    m68k        mcf5227x    m52277evb           freescale      -           M52277EVB:SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000