[U-Boot] [PATCH 0/2] ARM: omap3: evm: Fix serial driver compiler warnings
This small series resolves compiler warnings that are generated when DM_SERIAL is enabled for OMAP3 boards using "include/configs/ti_omap3_common.h".
Derald D. Woods (2): ARM: omap3: ti_omap3_common: Fix CONFIG_SYS_NS16550_REG_SIZE compiler warning ARM: omap3: evm: Remove CONFIG_SYS_NS16550_REG_SIZE undefine
include/configs/omap3_evm.h | 3 --- include/configs/ti_omap3_common.h | 10 ++++++---- 2 files changed, 6 insertions(+), 7 deletions(-)
This commit fixes the following compiler warnings when DM_SERIAL is enabled.
---8<------------------------------------------------------------------- ...
CC spl/board/ti/evm/evm.o In file included from /solution/scm/u-boot-master/board/ti/evm/evm.c:16:0: /solution/scm/u-boot-master/include/ns16550.h:31:0: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined #define CONFIG_SYS_NS16550_REG_SIZE (-1)
In file included from /solution/scm/u-boot-master/include/configs/omap3_evm.h:22:0, from include/config.h:5, from /solution/scm/u-boot-master/include/common.h:21, from /solution/scm/u-boot-master/board/ti/evm/evm.c:14: /solution/scm/u-boot-master/include/configs/ti_omap3_common.h:33:0: note: this is the location of the previous definition # define CONFIG_SYS_NS16550_REG_SIZE (-4)
LD spl/board/ti/evm/built-in.o
...
CC spl/drivers/serial/ns16550.o In file included from /solution/scm/u-boot-master/drivers/serial/ns16550.c:11:0: /solution/scm/u-boot-master/include/ns16550.h:31:0: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined #define CONFIG_SYS_NS16550_REG_SIZE (-1)
In file included from /solution/scm/u-boot-master/include/configs/omap3_evm.h:22:0, from include/config.h:5, from /solution/scm/u-boot-master/include/common.h:21, from /solution/scm/u-boot-master/drivers/serial/ns16550.c:7: /solution/scm/u-boot-master/include/configs/ti_omap3_common.h:33:0: note: this is the location of the previous definition # define CONFIG_SYS_NS16550_REG_SIZE (-4)
LD spl/drivers/serial/built-in.o
... ---8<-------------------------------------------------------------------
Signed-off-by: Derald D. Woods woods.technical@gmail.com --- include/configs/ti_omap3_common.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 72c4b184d9..cd6a9c2197 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -28,10 +28,12 @@ /* NS16550 Configuration */ #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK -#ifdef CONFIG_SPL_BUILD -# define CONFIG_SYS_NS16550_SERIAL -# define CONFIG_SYS_NS16550_REG_SIZE (-4) -#endif +#if defined(CONFIG_SPL_BUILD) +#define CONFIG_SYS_NS16550_SERIAL +#if !defined(CONFIG_DM_SERIAL) +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#endif /* !CONFIG_DM_SERIAL */ +#endif /* CONFIG_SPL_BUILD */ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ 115200}
On Sun, Feb 04, 2018 at 07:04:49PM -0600, Derald D. Woods wrote:
This commit fixes the following compiler warnings when DM_SERIAL is enabled.
Reviewed-by: Tom Rini trini@konsulko.com
On Sun, Feb 04, 2018 at 07:04:49PM -0600, Derald D. Woods wrote:
This commit fixes the following compiler warnings when DM_SERIAL is enabled.
Applied to u-boot/master, thanks!
This commit removes an attempt to workaround a previous compilation warning that is is now fixed in "include/configs/ti_omap3_common.h".
Signed-off-by: Derald D. Woods woods.technical@gmail.com --- include/configs/omap3_evm.h | 3 --- 1 file changed, 3 deletions(-)
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 71d49e3cd3..c143c5af5c 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -40,9 +40,6 @@ #undef CONFIG_CONS_INDEX #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#if defined(CONFIG_SPL_BUILD) -#undef CONFIG_SYS_NS16550_REG_SIZE -#endif /* CONFIG_SPL_BUILD */
/* NAND */ #if defined(CONFIG_NAND)
On Sun, Feb 04, 2018 at 07:04:50PM -0600, Derald D. Woods wrote:
This commit removes an attempt to workaround a previous compilation warning that is is now fixed in "include/configs/ti_omap3_common.h".
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
On Sun, Feb 04, 2018 at 07:04:50PM -0600, Derald D. Woods wrote:
This commit removes an attempt to workaround a previous compilation warning that is is now fixed in "include/configs/ti_omap3_common.h".
Signed-off-by: Derald D. Woods woods.technical@gmail.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Derald D. Woods -
Tom Rini