diff mbox series

[V2,1/4] imx: imx8mp_evk: enable CONFIG_DM_SERIAL

Message ID 20220412041419.9083-2-peng.fan@oss.nxp.com
State Superseded
Delegated to: Stefano Babic
Headers show
Series imx: imx8m: enable DM SERIAL | expand

Commit Message

Peng Fan (OSS) April 12, 2022, 4:14 a.m. UTC
From: Peng Fan <peng.fan@nxp.com>

Enable CONFIG_DM_SERIAL. uart2 and its pinmux was already
marked with u-boot,dm-spl.

File generated with make savedefconfig
---
 board/freescale/imx8mp_evk/imx8mp_evk.c | 8 --------
 configs/imx8mp_evk_defconfig            | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

Comments

Fabio Estevam April 12, 2022, 10:09 a.m. UTC | #1
Hi Peng,

Thanks for reworking this series.

On Tue, Apr 12, 2022 at 12:33 AM Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote:
>
> From: Peng Fan <peng.fan@nxp.com>
>
> Enable CONFIG_DM_SERIAL. uart2 and its pinmux was already
> marked with u-boot,dm-spl.
>
> File generated with make savedefconfig

IMHO, running savedefconfig in the same patch makes it more confusing
to review it.

My understanding is that Tom generates savedefconfig for each
defconfig via script.

Tom, is this correct?

Also, you missed your Signed-off-by line.
Tom Rini April 12, 2022, 11:57 a.m. UTC | #2
On Tue, Apr 12, 2022 at 07:09:24AM -0300, Fabio Estevam wrote:
> Hi Peng,
> 
> Thanks for reworking this series.
> 
> On Tue, Apr 12, 2022 at 12:33 AM Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote:
> >
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > Enable CONFIG_DM_SERIAL. uart2 and its pinmux was already
> > marked with u-boot,dm-spl.
> >
> > File generated with make savedefconfig
> 
> IMHO, running savedefconfig in the same patch makes it more confusing
> to review it.
> 
> My understanding is that Tom generates savedefconfig for each
> defconfig via script.
> 
> Tom, is this correct?
> 
> Also, you missed your Signed-off-by line.

Yes, extra changes in the defconfig should be avoided.  For larger
series what I'll do locally is run tools/moveconfig.py -sC, then the
migrations, and then discard the resync commit when posting (as it
rarely matters).  For smaller series like this, just edit the patch
before sending to omit the hunks.  It's not a huge deal either way to me
since I'll just re-sync the configs if the patch doesn't apply cleanly.
diff mbox series

Patch

diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
index 62096c24fb7..fb6c61c39e7 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
@@ -20,14 +20,8 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define UART_PAD_CTRL	(PAD_CTL_DSE6 | PAD_CTL_FSEL1)
 #define WDOG_PAD_CTRL	(PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
 
-static iomux_v3_cfg_t const uart_pads[] = {
-	MX8MP_PAD_UART2_RXD__UART2_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX8MP_PAD_UART2_TXD__UART2_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
 static iomux_v3_cfg_t const wdog_pads[] = {
 	MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B  | MUX_PAD_CTRL(WDOG_PAD_CTRL),
 };
@@ -40,8 +34,6 @@  int board_early_init_f(void)
 
 	set_wdog_reset(wdog);
 
-	imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
-
 	return 0;
 }
 
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig
index 9a8bd020343..01240e543af 100644
--- a/configs/imx8mp_evk_defconfig
+++ b/configs/imx8mp_evk_defconfig
@@ -2,7 +2,6 @@  CONFIG_ARM=y
 CONFIG_ARCH_IMX8M=y
 CONFIG_SYS_TEXT_BASE=0x40200000
 CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x10000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -20,8 +19,8 @@  CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL=y
 CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
@@ -92,6 +91,7 @@  CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SPL_POWER_I2C=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SPL_SYSRESET=y