| Message ID | 1443437272-1939-4-git-send-email-mugunthanvnm@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Monday 28 September 2015 04:17 PM, Mugunthan V N wrote: > Tested on am437x gp evm and am437x sk evm > > Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> > --- > include/configs/am43xx_evm.h | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h > index d868442..03713e3 100644 > --- a/include/configs/am43xx_evm.h > +++ b/include/configs/am43xx_evm.h > @@ -23,9 +23,13 @@ > > /* NS16550 Configuration */ > #define CONFIG_SYS_NS16550 > +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) > #define CONFIG_SYS_NS16550_SERIAL > -#define CONFIG_SYS_NS16550_REG_SIZE (-4) > #define CONFIG_SYS_NS16550_CLK 48000000 > +#define CONFIG_SYS_NS16550_REG_SIZE (-4) You are deleting and adding the same line under if. Is this really necessary? Rest looks good to me. Thanks and regards, Lokesh
On Monday 28 September 2015 04:25 PM, Lokesh Vutla wrote: > > On Monday 28 September 2015 04:17 PM, Mugunthan V N wrote: >> > Tested on am437x gp evm and am437x sk evm >> > >> > Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> >> > --- >> > include/configs/am43xx_evm.h | 6 +++++- >> > 1 file changed, 5 insertions(+), 1 deletion(-) >> > >> > diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h >> > index d868442..03713e3 100644 >> > --- a/include/configs/am43xx_evm.h >> > +++ b/include/configs/am43xx_evm.h >> > @@ -23,9 +23,13 @@ >> > >> > /* NS16550 Configuration */ >> > #define CONFIG_SYS_NS16550 >> > +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) >> > #define CONFIG_SYS_NS16550_SERIAL >> > -#define CONFIG_SYS_NS16550_REG_SIZE (-4) >> > #define CONFIG_SYS_NS16550_CLK 48000000 >> > +#define CONFIG_SYS_NS16550_REG_SIZE (-4) > You are deleting and adding the same line under if. Is this really > necessary? > > Rest looks good to me. Oops, thats not needed, Copy paste error (was playing with serial clock during debug). Will fix in v2. Regards Mugunthan V N
On Mon, Sep 28, 2015 at 04:17:49PM +0530, Mugunthan V N wrote: > Tested on am437x gp evm and am437x sk evm > > Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index d868442..03713e3 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -23,9 +23,13 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550 +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 48000000 +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#else +#define CONFIG_OMAP_SERIAL +#endif /* I2C Configuration */ #define CONFIG_CMD_EEPROM
Tested on am437x gp evm and am437x sk evm Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> --- include/configs/am43xx_evm.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)