From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 8 Jun 2013 12:35:10 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.07-rc1~2^2~5
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=10e167329b029890a4c704f094822da5f259b886

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

Conflicts:
	drivers/serial/Makefile
---

10e167329b029890a4c704f094822da5f259b886
diff --cc drivers/serial/Makefile
index 442b7ea0df,bb6559b27c..0f954a5f33
--- a/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