Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
	drivers/serial/Makefile

diff --combined MAINTAINERS
index 14075afae484998a5bbb12dd14c3eaf41f5337c8,d3b7e1a543dc538515f7e04890d3896782c077ea..21b498bb7fb5cf29ab5a1ed566ccccc58ed03b93
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -850,10 -850,6 +850,10 @@@ Sricharan R <r.sricharan@ti.com
        omap4_sdp4430   ARM ARMV7 (OMAP4xx SoC)
        omap5_evm       ARM ARMV7 (OMAP5xx Soc)
  
 +Suriyan Ramasami <suriyan.r@gmail.com>
 +
 +      goflexhome      ARM926EJS (Kirkwood SoC)
 +
  Thierry Reding <thierry.reding@avionic-design.de>
  
        plutux          Tegra20 (ARM7 & A9 Dual Core)
@@@ -897,6 -893,10 +897,10 @@@ Steve Sakoman <sakoman@gmail.com
  
        omap3_overo     ARM ARMV7 (OMAP3xx SoC)
  
+ Leo Sartre <lsartre@adeneo-embedded.com>
+ 
+       cgtqmx6qeval            i.MX6Q
+ 
  Jens Scharsig <esw@bus-elektronik.de>
  
        eb_cpux9k2      ARM920T (AT91RM9200 SoC)
@@@ -922,7 -922,6 +926,7 @@@ Matt Sealey <matt@genesi-usa.com
  
  Bo Shen <voice.shen@atmel.com>
        at91sam9x5ek            ARM926EJS (AT91SAM9G15,G25,G35,X25,X35 SoC)
 +      sama5d3xek              ARMV7 (SAMA5D31, D33, D34, D35 SoC)
  
  Rajeshwari Shinde <rajeshwari.s@samsung.com>
  
@@@ -971,8 -970,7 +975,8 @@@ Hugo Villeneuve <hugo.villeneuve@lyrtec
  
  Matt Waddel <matt.waddel@linaro.org>
  
 -      ca9x4_ct_vxp    ARM ARMV7 (Quad Core)
 +      vexpress_ca9x4  ARM ARMV7 (Quad Core)
 +      vexpress_ca5x2  ARM ARMV7 (Dual Core)
  
  Otavio Salvador <otavio@ossystems.com.br>
  
@@@ -1029,9 -1027,6 +1033,9 @@@ Richard Woodruff <r-woodruff2@ti.com
  
        omap2420h4      ARM1136EJS
  
 +Josh Wu <josh.wu@atmel.com>
 +      at91sam9n12ek   ARM926EJS (AT91SAM9N12 SoC)
 +
  Ilya Yanok <yanok@emcraft.com>
  
        mcx             ARM ARMV7 (AM35x SoC)
@@@ -1066,6 -1061,10 +1070,10 @@@ Eric Nelson <eric.nelson@boundarydevice
        nitrogen6s              i.MX6S          512MB
        nitrogen6s1g            i.MX6S          1GB
  
+ Alison Wang <b18965@freescale.com>
+ 
+       vf610twr        VF610
+ 
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1086,19 -1085,9 +1094,19 @@@
  #     Board           CPU                                             #
  #########################################################################
  
 -Graeme Russ <graeme.russ@gmail.com>
 +Simon Glass <sjg@chromium.org>
  
 -      eNET            AMD SC520
 +      chromebook-x86  Coreboot runs first, then U-Boot
 +                      Supports Intel Sandy Bridge / Ivy Bridge so far
 +
 +                      Chromebooks for x86, including:
 +                              Samsung Series 5 Chromebook
 +                              Acer AC700 Chromebook
 +                              Acer C7 Chromebook
 +                              Samsung Chromebook 550
 +                              HP Pavillion Chromebook
 +                              Acer C710 Chromebook
 +                              Chromebook Pixel
  
  #########################################################################
  # MIPS Systems:                                                               #
@@@ -1363,17 -1352,6 +1371,17 @@@ Stefan Kristiansson <stefan.kristiansso
  
        openrisc-generic        OpenRISC
  
 +#########################################################################
 +# Sandbox:                                                            #
 +#                                                                     #
 +# Maintainer Name, Email Address                                      #
 +#     Board           CPU                                             #
 +#########################################################################
 +
 +Simon Glass <sjg@chromium.org>
 +
 +      sandbox         sandbox
 +
  #########################################################################
  # End of MAINTAINERS list                                             #
  #########################################################################

diff --combined Makefile
index ef154aa57cc0c73e5f87549e797e9c9d72c74d21,363180ccf2604c751a2ff1a7fc579a559b1fb051..af4c3c0a98daac04d010a165cfb83e6023fde088
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -341,7 -341,7 +341,7 @@@ ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34X
  LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
  endif
  
- ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs))
+ ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610))
  LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
  endif
  
@@@ -543,15 -543,18 +543,15 @@@ $(obj)u-boot.spr:       $(obj)u-boot.img $(ob
                cat $(obj)spl/u-boot-spl-pad.img $(obj)u-boot.img > $@
  
  ifneq ($(CONFIG_TEGRA),)
 -ifeq ($(CONFIG_OF_SEPARATE),y)
 -nodtb=dtb
 -dtbfile=$(obj)u-boot.dtb
 -else
 -nodtb=nodtb
 -dtbfile=
 -endif
 -
 -$(obj)u-boot-$(nodtb)-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(dtbfile)
 +$(obj)u-boot-nodtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
                $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
 -              cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin $(dtbfile) > $@
 +              cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
                rm $(obj)spl/u-boot-spl-pad.bin
 +
 +ifeq ($(CONFIG_OF_SEPARATE),y)
 +$(obj)u-boot-dtb-tegra.bin: $(obj)u-boot-nodtb-tegra.bin $(obj)u-boot.dtb
 +              cat $(obj)u-boot-nodtb-tegra.bin $(obj)u-boot.dtb > $@
 +endif
  endif
  
  $(obj)u-boot-img.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img

diff --combined boards.cfg
index e2a8d42ab43194734d56457a1d29fa2b81f13892,fff4f45c1f526747db8e02506a856b8a88d03010..8876d889676234fa63b3ddbef4788e52725e9509
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -94,7 -94,6 +94,7 @@@ at91sam9g10ek_dataflash_cs3  ar
  at91sam9g10ek_nandflash      arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9G10,SYS_USE_NANDFLASH
  at91sam9g20ek_dataflash_cs0  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0
  at91sam9g20ek_dataflash_cs1  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1
 +at91sam9g20ek_mmc            arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_MMC
  at91sam9g20ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
  at91sam9g20ek_2mmc_nandflash arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH
  at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel          at91        at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
@@@ -107,9 -106,6 +107,9 @@@ at91sam9x5ek_mmc             ar
  at91sam9xeek_dataflash_cs0   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0
  at91sam9xeek_dataflash_cs1   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS1
  at91sam9xeek_nandflash       arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_NANDFLASH
 +at91sam9n12ek_nandflash      arm         arm926ejs   at91sam9n12ek       atmel          at91        at91sam9n12ek:AT91SAM9N12,SYS_USE_NANDFLASH
 +at91sam9n12ek_spiflash       arm         arm926ejs   at91sam9n12ek       atmel          at91        at91sam9n12ek:AT91SAM9N12,SYS_USE_SPIFLASH
 +at91sam9n12ek_mmc            arm         arm926ejs   at91sam9n12ek       atmel          at91        at91sam9n12ek:AT91SAM9N12,SYS_USE_MMC
  snapper9260                  arm         arm926ejs   -                   bluewater      at91        snapper9260:AT91SAM9260
  snapper9g20                  arm         arm926ejs   snapper9260         bluewater      at91        snapper9260:AT91SAM9G20
  vl_ma2sc                     arm         arm926ejs   vl_ma2sc            BuS            at91
@@@ -189,7 -185,6 +189,7 @@@ rd6281a                      ar
  sheevaplug                   arm         arm926ejs   -                   Marvell        kirkwood
  ib62x0                       arm         arm926ejs   ib62x0              raidsonic      kirkwood
  dockstar                     arm         arm926ejs   -                   Seagate        kirkwood
 +goflexhome                   arm         arm926ejs   -                   Seagate        kirkwood
  tk71                         arm         arm926ejs   tk71                karo           kirkwood
  devkit3250                   arm         arm926ejs   devkit3250          timll          lpc32xx
  jadecpu                      arm         arm926ejs   jadecpu             syteco         mb86r0x
@@@ -239,9 -234,7 +239,9 @@@ versatilepb                  ar
  versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
  integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
  integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
 -ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
 +vexpress_ca15_tc2            arm         armv7       vexpress            armltd
 +vexpress_ca5x2               arm         armv7       vexpress            armltd
 +vexpress_ca9x4               arm         armv7       vexpress            armltd
  am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
  am335x_evm_spiboot           arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPI_BOOT
  am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL2,CONS_INDEX=2
@@@ -252,9 -245,6 +252,9 @@@ am335x_evm_uart5             ar
  am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT
  ti814x_evm                   arm         armv7       ti814x              ti             am33xx
  pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
 +sama5d3xek_mmc               arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_MMC
 +sama5d3xek_nandflash         arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_NANDFLASH
 +sama5d3xek_spiflash          arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_SERIALFLASH
  highbank                     arm         armv7       highbank            -              highbank
  m53evk                       arm         armv7       m53evk              denx         mx5             m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg
  mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
@@@ -266,12 -256,14 +266,14 @@@ mx53loco                     ar
  mx53smd                      arm         armv7       mx53smd             freescale      mx5           mx53smd:IMX_CONFIG=board/freescale/mx53smd/imximage.cfg
  ima3-mx53                    arm         armv7       ima3-mx53           esg            mx5           ima3-mx53:IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg
  vision2                      arm         armv7       vision2             ttcontrol      mx5           vision2:IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg
+ cgtqmx6qeval                           arm             armv7           cgtqmx6eval             congatec               mx6             cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q
  mx6qarm2                     arm         armv7       mx6qarm2            freescale      mx6           mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg
  mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6           mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg
  mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6           mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
  mx6qsabresd                  arm         armv7       mx6qsabresd         freescale      mx6           mx6qsabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
  mx6slevk                     arm         armv7       mx6slevk            freescale      mx6           mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL
  titanium                     arm         armv7       titanium            freescale      mx6           titanium:IMX_CONFIG=board/freescale/titanium/imximage.cfg
+ vf610twr                     arm         armv7       vf610twr            freescale      vf610         vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg
  eco5pk                       arm         armv7       eco5pk              8dtech         omap3
  nitrogen6dl                  arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024
  nitrogen6dl2g                arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048
@@@ -325,7 -317,7 +327,7 @@@ seaboard                     ar
  ventana                      arm         armv7:arm720t ventana           nvidia         tegra20
  whistler                     arm         armv7:arm720t whistler          nvidia         tegra20
  cardhu                       arm         armv7:arm720t cardhu            nvidia         tegra30
 -beaver                       arm         armv7:arm720t cardhu            nvidia         tegra30
 +beaver                       arm         armv7:arm720t beaver            nvidia         tegra30
  dalmore                      arm         armv7:arm720t dalmore           nvidia         tegra114
  colibri_t20_iris             arm         armv7:arm720t colibri_t20_iris  toradex        tegra20
  u8500_href                   arm         armv7       u8500               st-ericsson    u8500
@@@ -602,6 -594,9 +604,6 @@@ TQM5200_B_HIGHBOOT           powerp
  TQM5200S                     powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:TQM5200_B,TQM5200S
  TQM5200S_HIGHBOOT            powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:TQM5200_B,TQM5200S,SYS_TEXT_BASE=0xFFF00000
  TQM5200_STK100               powerpc     mpc5xxx     tqm5200             tqc            -           TQM5200:STK52XX_REV100
 -Alaska8220                   powerpc     mpc8220     alaska
 -sorcery                      powerpc     mpc8220
 -Yukon8220                    powerpc     mpc8220     alaska
  A3000                        powerpc     mpc824x     a3000
  CPC45                        powerpc     mpc824x     cpc45               -              -           CPC45
  CPC45_ROMBOOT                powerpc     mpc824x     cpc45               -              -           CPC45:BOOT_ROM
@@@ -894,9 -889,6 +896,9 @@@ P5020DS_SECURE_BOOT          powerp
  P5020DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  P5020DS_SRIO_PCIE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  P5040DS                      powerpc     mpc85xx     corenet_ds          freescale
 +P5040DS_NAND               powerpc     mpc85xx     corenet_ds          freescale      -           P5040DS:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
 +P5040DS_SDCARD                     powerpc     mpc85xx     corenet_ds          freescale      -           P5040DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 +P5040DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P5040DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  BSC9131RDB_SPIFLASH          powerpc     mpc85xx     bsc9131rdb          freescale      -           BSC9131RDB:BSC9131RDB,SPIFLASH
  BSC9132QDS_NOR_DDRCLK100     powerpc     mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SYS_CLK_100_DDR_100
  BSC9132QDS_NOR_DDRCLK133     powerpc     mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SYS_CLK_100_DDR_133
@@@ -907,12 -899,9 +909,12 @@@ BSC9132QDS_SPIFLASH_DDRCLK133 powerp
  stxgp3                       powerpc     mpc85xx     stxgp3              stx
  stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa
  stxssa_4M                    powerpc     mpc85xx     stxssa              stx            -           stxssa:STXSSA_4M
 -T4240QDS                     powerpc     mpc85xx     t4qds               freescale
 -T4240QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 -T4240QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +T4240QDS                     powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4240
 +T4240QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 +T4240QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +T4160QDS                     powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4160
 +T4160QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4160,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 +T4160QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4160,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  B4860QDS                     powerpc     mpc85xx     b4860qds            freescale      -           B4860QDS:PPC_B4860
  B4860QDS_NAND              powerpc     mpc85xx     b4860qds            freescale      -           B4860QDS:PPC_B4860,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
  B4860QDS_SPIFLASH            powerpc     mpc85xx     b4860qds            freescale    -           B4860QDS:PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000

diff --combined drivers/serial/Makefile
index 442b7ea0df445b9c56c22c7ee9260dbc19b7059c,bb6559b27c7738d107b616ecdb93337729a66a4a..0f954a5f33af42b758561b7cc2a93bf8f15d0e9c
--- 1/drivers/serial/Makefile
--- 2/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@@ -52,7 -52,7 +52,8 @@@ COBJS-$(CONFIG_XILINX_UARTLITE) += seri
  COBJS-$(CONFIG_SANDBOX_SERIAL) += sandbox.o
  COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
  COBJS-$(CONFIG_ZYNQ_SERIAL) += serial_zynq.o
 +COBJS-$(CONFIG_BFIN_SERIAL) += serial_bfin.o
+ COBJS-$(CONFIG_FSL_LPUART) += serial_lpuart.o
  
  ifndef CONFIG_SPL_BUILD
  COBJS-$(CONFIG_USB_TTY) += usbtty.o

diff --combined drivers/watchdog/Makefile
index d57578df6c2e0ac5bdd65bbf96b6fe407e1f8efd,e96acabe8650afc36fec2f8cd11f02e51db753ab..b9bbbc63398e9a9c17e9327bbd0d1a00b5ac5515
--- 1/drivers/watchdog/Makefile
--- 2/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@@ -27,13 -27,12 +27,13 @@@ LIB        := $(obj)libwatchdog.
  
  COBJS-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o
  COBJS-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o
- ifneq (,$(filter $(SOC), mx31 mx35 mx5 mx6))
+ ifneq (,$(filter $(SOC), mx31 mx35 mx5 mx6 vf610))
  COBJS-y += imx_watchdog.o
  endif
  COBJS-$(CONFIG_TNETV107X_WATCHDOG) += tnetv107x_wdt.o
  COBJS-$(CONFIG_S5P)               += s5p_wdt.o
  COBJS-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o
 +COBJS-$(CONFIG_BFIN_WATCHDOG)  += bfin_wdt.o
  
  COBJS := $(COBJS-y)
  SRCS  := $(COBJS:.o=.c)

diff --combined tools/Makefile
index 26eb50082f7b3998864b65a1a03ce638c8db20f0,93f4a84547e1064e04b4523f26a0423ac8dcc9a2..4630f03dc53a93792d4c1e1f7f2c1fa60f6f20d2
--- 1/tools/Makefile
--- 2/tools/Makefile
+++ b/tools/Makefile
@@@ -78,7 -78,6 +78,7 @@@ BIN_FILES-$(CONFIG_KIRKWOOD) += kwboot$
  # Source files which exist outside the tools directory
  EXT_OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += common/env_embedded.o
  EXT_OBJ_FILES-y += common/image.o
 +EXT_OBJ_FILES-$(CONFIG_FIT) += common/image-fit.o
  EXT_OBJ_FILES-y += lib/crc32.o
  EXT_OBJ_FILES-y += lib/md5.o
  EXT_OBJ_FILES-y += lib/sha1.o
@@@ -96,7 -95,6 +96,7 @@@ NOPED_OBJ_FILES-y += aisimage.
  NOPED_OBJ_FILES-y += kwbimage.o
  NOPED_OBJ_FILES-y += pblimage.o
  NOPED_OBJ_FILES-y += imximage.o
 +NOPED_OBJ_FILES-y += image-host.o
  NOPED_OBJ_FILES-y += omapimage.o
  NOPED_OBJ_FILES-y += mkenvimage.o
  NOPED_OBJ_FILES-y += mkimage.o
@@@ -130,28 -128,21 +130,21 @@@ LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_DATA_
  LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_H)
  LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_DATA_H)
  
+ # Generic logo
  ifeq ($(LOGO_BMP),)
  LOGO_BMP= logos/denx.bmp
+ 
+ # Use board logo and fallback to vendor
+ ifneq ($(wildcard logos/$(BOARD).bmp),)
+ LOGO_BMP= logos/$(BOARD).bmp
+ else
+ ifneq ($(wildcard logos/$(VENDOR).bmp),)
+ LOGO_BMP= logos/$(VENDOR).bmp
  endif
- ifeq ($(VENDOR),atmel)
- LOGO_BMP= logos/atmel.bmp
- endif
- ifeq ($(VENDOR),esd)
- LOGO_BMP= logos/esd.bmp
- endif
- ifeq ($(VENDOR),freescale)
- LOGO_BMP= logos/freescale.bmp
- endif
- ifeq ($(VENDOR),ronetix)
- LOGO_BMP= logos/ronetix.bmp
- endif
- ifeq ($(VENDOR),syteco)
- LOGO_BMP= logos/syteco.bmp
- endif
- ifeq ($(VENDOR),intercontrol)
- LOGO_BMP= logos/intercontrol.bmp
  endif
  
+ endif # !LOGO_BMP
+ 
  # now $(obj) is defined
  HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
  HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
@@@ -211,9 -202,7 +204,9 @@@ $(obj)mkimage$(SFX):       $(obj)aisimage.o 
                        $(obj)crc32.o \
                        $(obj)default_image.o \
                        $(obj)fit_image.o \
 +                      $(obj)image-fit.o \
                        $(obj)image.o \
 +                      $(obj)image-host.o \
                        $(obj)imximage.o \
                        $(obj)kwbimage.o \
                        $(obj)pblimage.o \