diff mbox series

[U-Boot,v2,1/2] warp7: Switch to DM Serial

Message ID 1555698852-6645-2-git-send-email-pjtexier@koncepto.io
State Accepted
Commit 0710726d047f559b17a64d8cce860639c635adfd
Delegated to: Stefano Babic
Headers show
Series Convert WaRP7 to DM_USB and DM_SERIAL | expand

Commit Message

Pierre-Jean Texier April 19, 2019, 6:34 p.m. UTC 
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>
---

Changes in v2:
    - Split patch
    - Removed CONFIG_MXC_UART_BASE from config file
    
 arch/arm/dts/imx7s-warp.dts  | 4 ++++
 configs/warp7_bl33_defconfig | 2 ++
 configs/warp7_defconfig      | 2 ++
 include/configs/warp7.h      | 2 --
 4 files changed, 8 insertions(+), 2 deletions(-)

Comments

Fabio Estevam April 19, 2019, 10:52 p.m. UTC | #1 
On Fri, Apr 19, 2019 at 3:35 PM Pierre-Jean Texier <pjtexier@koncepto.io> wrote:
>
> 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>
Stefano Babic April 26, 2019, 9:38 a.m. UTC | #2 
> 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>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index d28b7ec..4d87348 100644
--- 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 6eaf152..d34f76b 100644
--- 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 28aa06f..ae424ab 100644
--- 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 043f286..2bbf691 100644
--- 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)