rockchip: serial: Kconfig: allow ROCKCHIP_SERIAL enabled in TPL

The serial_rockchip.c driver converts platdata to the data structure
used in the ns16550.c file and then calls the function
ns16550_serial_probe().
When compiled with OF_REAL the serial_rockchip.c driver returns
now -ENODEV when probed and does no harm.
The config ROCKCHIP_SERIAL is currently depends on SPL_OF_PLATDATA.
Allow serial port use for both SPL and TPL by removing this
dependency and SPL_BUILD restriction.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b5c6005b0487079910915c218bc59ee8a8183895..1e595d06004781d0796054599744fc4648c2cf6b 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -762,11 +762,11 @@ config PL01X_SERIAL
 
 config ROCKCHIP_SERIAL
        bool "Rockchip on-chip UART support"
-       depends on DM_SERIAL && SPL_OF_PLATDATA
+       depends on DM_SERIAL
        select SYS_NS16550
        help
          Select this to enable a debug UART for Rockchip devices when using
-         CONFIG_SPL_OF_PLATDATA (i.e. a compiled-in device tree replacemenmt).
+         OF_PLATDATA (i.e. a compiled-in device tree replacemenmt).
          This uses the ns16550 driver, converting the platdata from of-platdata
          to the ns16550 format.
 

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index b68b5e7b2bfd59bfa4f33cea2e2d2b537df45dc0..d8e26d72ea2853560faa244bdbea69d3b7b96187 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -46,9 +46,7 @@ obj-$(CONFIG_MXC_UART) += serial_mxc.o
 obj-$(CONFIG_PXA_SERIAL) += serial_pxa.o
 obj-$(CONFIG_MESON_SERIAL) += serial_meson.o
 obj-$(CONFIG_INTEL_MID_SERIAL) += serial_intel_mid.o
-ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_ROCKCHIP_SERIAL) += serial_rockchip.o
-endif
 obj-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
 obj-$(CONFIG_SANDBOX_SERIAL) += sandbox.o
 obj-$(CONFIG_SCIF_CONSOLE) += serial_sh.o