diff options
author | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
commit | 41341221d12341a2ecfb280142d6478071738fc2 (patch) | |
tree | 850a87b274b572b65a579474a0aad5e590ca6d61 /drivers/serial/Makefile | |
parent | b7ab8b8ff092ab8214eeb86e8a79573154f448b9 (diff) | |
parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) | |
download | u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.zip u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.tar.gz u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR
Conflicts:
arch/arm/include/asm/arch-omap5/omap.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/serial/Makefile')
-rw-r--r-- | drivers/serial/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 442b7ea..0f954a5 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -53,6 +53,7 @@ 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 |