summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-04-02 09:50:32 -0600
committerTom Rini <trini@konsulko.com>2017-04-05 16:36:59 -0400
commit891f7ae63318293cd5807fb611f86f545080b1f6 (patch)
tree27d59064d6f953675b95b162d48c0bfb70d2cd0b
parent5a6f06f696c9c4cf84666ac12b3b3bc3f6fcd93d (diff)
downloadu-boot-891f7ae63318293cd5807fb611f86f545080b1f6.tar.gz
u-boot-891f7ae63318293cd5807fb611f86f545080b1f6.tar.xz
u-boot-891f7ae63318293cd5807fb611f86f545080b1f6.zip
dm: serial: Allow driver-model serial to be disabled for TPL
Add separate enable/disable controls for driver-model serial. While this is generally enabled in SPL it may not be in TPL, since serial output can be obtained with the debug UART with minimal code size. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--drivers/serial/Kconfig20
-rw-r--r--drivers/serial/Makefile2
2 files changed, 21 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ca56a7e604..0900cc8acb 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -53,6 +53,26 @@ config DM_SERIAL
implements serial_putc() etc. The uclass interface is
defined in include/serial.h.
+config SPL_DM_SERIAL
+ bool "Enable Driver Model for serial drivers"
+ depends on DM_SERIAL
+ default y if SPL && DM_SERIAL
+ help
+ Enable driver model for serial in SPL. This replaces
+ drivers/serial/serial.c with the serial uclass, which
+ implements serial_putc() etc. The uclass interface is
+ defined in include/serial.h.
+
+config TPL_DM_SERIAL
+ bool "Enable Driver Model for serial drivers"
+ depends on DM_SERIAL
+ default y if TPL && DM_SERIAL
+ help
+ Enable driver model for serial in TPL. This replaces
+ drivers/serial/serial.c with the serial uclass, which
+ implements serial_putc() etc. The uclass interface is
+ defined in include/serial.h.
+
config DEBUG_UART
bool "Enable an early debug UART for debugging"
help
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 4ed4bba1bb..8ba15ce028 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -6,7 +6,7 @@
#
ifdef CONFIG_DM_SERIAL
-obj-y += serial-uclass.o
+obj-$(CONFIG_$(SPL_TPL_)DM_SERIAL) += serial-uclass.o
obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o
else
obj-y += serial.o