Message ID | 1453186108-40278-3-git-send-email-wenbin.song@nxp.com |
---|---|
State | Superseded |
Delegated to: | York Sun |
Headers | show |
> -----Original Message----- > From: Wenbin Song [mailto:wenbin.song@nxp.com] > Sent: Tuesday, January 19, 2016 2:48 PM > To: yorksun@freescale.com; Mingkai Hu; Qianyu Gong; Shaohui Xie; Wenbin > Song; u-boot@lists.denx.de > Cc: songwenbin > Subject: [PATCH 3/4] armv8/ls1043aqds: Fix CONFIG_LPUART > > From: songwenbin <Wenbin.Song@freescale.com> > > If configured CONFIG_LPUART, should undefine the NS16550 > > Signed-off-by: Wenbin Song <wenbin.song@nxp.com> > --- > include/configs/ls1043aqds.h | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h > index 398f1c3..88f4bc0 100644 > --- a/include/configs/ls1043aqds.h > +++ b/include/configs/ls1043aqds.h > @@ -88,6 +88,17 @@ unsigned long get_board_ddr_clk(void); #define > CONFIG_SYS_FSL_PBL_RCW > board/freescale/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg > #endif > > +/* > + * LPUART > + */ > +#ifdef CONFIG_LPUART > +#define CONFIG_FSL_LPUART > +#define CONFIG_LPUART_32B_REG > +#undef CONFIG_CONS_INDEX > +#undef CONFIG_SYS_NS16550_SERIAL > +#undef CONFIG_SYS_NS16550_CLK > +#endif > + > /* SATA */ > #define CONFIG_LIBATA > #define CONFIG_SCSI_AHCI > -- > 2.1.0.27.g96db324 It's better to rephrase tile to "armv8/ls1043aqds: add LPUART support"? And give more information about "undefine the NS16550" in commit message. Thanks, Mingkai
Hi Wenbin, On Tue, Jan 19, 2016 at 2:48 PM, Wenbin Song <wenbin.song@nxp.com> wrote: > From: songwenbin <Wenbin.Song@freescale.com> > > If configured CONFIG_LPUART, should undefine the NS16550 > > Signed-off-by: Wenbin Song <wenbin.song@nxp.com> > --- > include/configs/ls1043aqds.h | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h > index 398f1c3..88f4bc0 100644 > --- a/include/configs/ls1043aqds.h > +++ b/include/configs/ls1043aqds.h > @@ -88,6 +88,17 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg > #endif > > +/* > + * LPUART > + */ > +#ifdef CONFIG_LPUART > +#define CONFIG_FSL_LPUART > +#define CONFIG_LPUART_32B_REG > +#undef CONFIG_CONS_INDEX > +#undef CONFIG_SYS_NS16550_SERIAL > +#undef CONFIG_SYS_NS16550_CLK > +#endif > + Please update board defconfig instead #define / #undef in the configuration header. The NS16550 and LPUART are now both Kconfig options. Regards, Bin
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 398f1c3..88f4bc0 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -88,6 +88,17 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg #endif +/* + * LPUART + */ +#ifdef CONFIG_LPUART +#define CONFIG_FSL_LPUART +#define CONFIG_LPUART_32B_REG +#undef CONFIG_CONS_INDEX +#undef CONFIG_SYS_NS16550_SERIAL +#undef CONFIG_SYS_NS16550_CLK +#endif + /* SATA */ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI