summaryrefslogtreecommitdiff
path: root/drivers/serial/Makefile
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-09-22 17:30:57 -0600
committerSimon Glass <sjg@chromium.org>2014-10-22 10:36:57 -0600
commitaed2fbef5e9a0ab5a7cd01e742039a962f0b24ef (patch)
treeb35834c158bf3999a0987b815c2e87fc77b8a9e6 /drivers/serial/Makefile
parent41e98e011da9a3a4461e8cb1479ce343898264fe (diff)
downloadu-boot-imx-aed2fbef5e9a0ab5a7cd01e742039a962f0b24ef.zip
u-boot-imx-aed2fbef5e9a0ab5a7cd01e742039a962f0b24ef.tar.gz
u-boot-imx-aed2fbef5e9a0ab5a7cd01e742039a962f0b24ef.tar.bz2
dm: serial: Tidy up the pl01x driver
Adjust the driver so that leaf functions take a pointer to the serial port register base. Put all the global configuration in the init function, and use the same settings from then on. This makes it much easier to move to driver model without duplicating the code, since with driver model we use platform data rather than global settings. The driver is compiled with either the CONFIG_PL010_SERIAL or CONFIG_PL011_SERIAL option and this determines the uart type. With driver model this needs to come in from platform data, so create a new CONFIG_PL01X_SERIAL config which brings in the driver, and adjust the driver to support both peripheral variants. Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'drivers/serial/Makefile')
-rw-r--r--drivers/serial/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index b4f299b..17c56ea 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -7,8 +7,11 @@
ifdef CONFIG_DM_SERIAL
obj-y += serial-uclass.o
+obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o
else
obj-y += serial.o
+obj-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
+obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o
endif
@@ -25,8 +28,6 @@ obj-$(CONFIG_IMX_SERIAL) += serial_imx.o
obj-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o
obj-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
obj-$(CONFIG_MXC_UART) += serial_mxc.o
-obj-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
-obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
obj-$(CONFIG_PXA_SERIAL) += serial_pxa.o
obj-$(CONFIG_SA1100_SERIAL) += serial_sa1100.o
obj-$(CONFIG_S3C24X0_SERIAL) += serial_s3c24x0.o