Commit 313ed5d5050bc5603c9d78742363d077d3c53e0d
Committed by
Tom Rini
1 parent
d695d66278
Exists in
smarc_8mq_lf_v2020.04
and in
17 other branches
ARM: omap3: ti_omap3_common: Fix CONFIG_SYS_NS16550_REG_SIZE compiler warning
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> Reviewed-by: Tom Rini <trini@konsulko.com>
Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff
include/configs/ti_omap3_common.h
... | ... | @@ -28,10 +28,12 @@ |
28 | 28 | /* NS16550 Configuration */ |
29 | 29 | #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ |
30 | 30 | #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK |
31 | -#ifdef CONFIG_SPL_BUILD | |
32 | -# define CONFIG_SYS_NS16550_SERIAL | |
33 | -# define CONFIG_SYS_NS16550_REG_SIZE (-4) | |
34 | -#endif | |
31 | +#if defined(CONFIG_SPL_BUILD) | |
32 | +#define CONFIG_SYS_NS16550_SERIAL | |
33 | +#if !defined(CONFIG_DM_SERIAL) | |
34 | +#define CONFIG_SYS_NS16550_REG_SIZE (-4) | |
35 | +#endif /* !CONFIG_DM_SERIAL */ | |
36 | +#endif /* CONFIG_SPL_BUILD */ | |
35 | 37 | #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ |
36 | 38 | 115200} |
37 | 39 |