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

Conflicts:
	drivers/serial/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc 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 --cc drivers/watchdog/Makefile
Simple merge

diff --cc tools/Makefile
Simple merge