diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig index dd332ece72..43e1324acc 100644 --- a/configs/ringneck-px30_defconfig +++ b/configs/ringneck-px30_defconfig @@ -111,9 +111,9 @@ CONFIG_DM_RESET=y CONFIG_DM_RNG=y CONFIG_RNG_ROCKCHIP=y # CONFIG_SPECIFY_CONSOLE_INDEX is not set -CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_SKIP_INIT=y -CONFIG_SYS_NS16550_MEM32=y +CONFIG_TPL_SYS_NS16550_SERIAL=y +CONFIG_SYS_NS16550_REG_SIZE=-4 CONFIG_SOUND=y CONFIG_SYSRESET=y CONFIG_DM_THERMAL=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index bb5083201b..d40f7dac2a 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -731,6 +731,11 @@ config SPL_SYS_NS16550_SERIAL default y if SYS_NS16550_SERIAL || ARCH_SUNXI || ARCH_OMAP2PLUS select SYS_NS16550 +config TPL_SYS_NS16550_SERIAL + bool "NS16550 UART or compatible legacy driver in TPL" + depends on TPL && !TPL_DM_SERIAL + select SYS_NS16550 + config SYS_NS16550 bool "NS16550 UART or compatible" help @@ -771,7 +776,7 @@ config SYS_NS16550_PORT_MAPPED config SYS_NS16550_REG_SIZE int "ns16550 register width and endianness" - depends on SYS_NS16550_SERIAL || SPL_SYS_NS16550_SERIAL + depends on SYS_NS16550_SERIAL || SPL_SYS_NS16550_SERIAL || TPL_SYS_NS16550_SERIAL range -4 4 default -4 if ARCH_OMAP2PLUS || ARCH_SUNXI default 1