warp7: Switch to DM Serial

This commit switches to DM SERIAL for warp7 and warp7_bl33 defconfigs.

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Joris Offouga <offougajoris@gmail.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index d28b7ec7155921ab6ecc07a795d2a2a89c6cfff7..4d87348f643ecbdd7ceabbb74b388fa91cc8fb73 100644 (file)
--- a/arch/arm/dts/imx7s-warp.dts
+++ b/arch/arm/dts/imx7s-warp.dts
@@ -21,6 +21,10 @@
                mmc0 = &usdhc3;
        };
 
+       chosen {
+               stdout-path = &uart1;
+       };
+
        gpio-keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&pinctrl_gpio>;

diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig
index 6eaf152bace68d442f5f7e5b730101ca80239f7f..d34f76b3e835938adad49a9d1a4ea64db2cdaaef 100644 (file)
--- a/configs/warp7_bl33_defconfig
+++ b/configs/warp7_bl33_defconfig
@@ -38,6 +38,8 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y

diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 28aa06fa5950927f5aa77f22f365af55e0b1561e..ae424ab7a0b35859316745ca50ed13afd65b791c 100644 (file)
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -47,6 +47,8 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
 CONFIG_OPTEE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 4947597b405740c5a79aed21dd3bcfb99d917bcc..37649cf2c5f710aa09b2a25a3891b76b9a07852c 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -24,8 +24,6 @@
 #endif
 #endif
 
-#define CONFIG_MXC_UART_BASE           UART1_IPS_BASE_ADDR
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (35 * SZ_1M)