diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 14:35:10 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 14:35:10 +0200 |
| commit | 10e167329b029890a4c704f094822da5f259b886 (patch) | |
| tree | c0950b7cb928ee26b07c39348e4539602ce3aec9 /drivers/serial/Makefile | |
| parent | dbc000bfb51eb30d786521e6b8e29048c36cbefa (diff) | |
| parent | 4a1c7b13ae104d4526d3176793b7f6b06694df15 (diff) | |
| download | u-boot-imx-10e167329b029890a4c704f094822da5f259b886.zip u-boot-imx-10e167329b029890a4c704f094822da5f259b886.tar.gz u-boot-imx-10e167329b029890a4c704f094822da5f259b886.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/Makefile
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 |