[U-Boot] arm: omap: configs: various: Remove references to OMAP34XX_UARTx
Adam Ford
aford173 at gmail.com
Mon Aug 20 12:45:16 UTC 2018
On Mon, Aug 20, 2018 at 6:21 AM Tom Rini <trini at konsulko.com> wrote:
>
> On Tue, Aug 07, 2018 at 07:28:11AM -0500, Adam Ford wrote:
>
> > Two boards include a reference to ti_omap3_common.h which
> > points the UART driver to OMAP34XX_UARTx so the extra define
> > should be unnecessary.
> >
> > Signed-off-by: Adam Ford <aford173 at gmail.com>
> > ---
> > include/configs/omap3_evm.h | 1 -
> > include/configs/omap3_pandora.h | 1 -
> > 2 files changed, 2 deletions(-)
> >
> > diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
> > index 34418309cb..779087a949 100644
> > --- a/include/configs/omap3_evm.h
> > +++ b/include/configs/omap3_evm.h
> > @@ -34,7 +34,6 @@
> > #define CONFIG_REVISION_TAG
> >
> > /* Override OMAP3 serial console configuration */
> > -#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
> >
> > /* NAND */
> > #if defined(CONFIG_NAND)
> > diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
> > index 68e1d6f82d..1fc40e05ff 100644
> > --- a/include/configs/omap3_pandora.h
> > +++ b/include/configs/omap3_pandora.h
> > @@ -36,7 +36,6 @@
> > #define CONFIG_SYS_NS16550_SERIAL
> > #define CONFIG_SYS_NS16550_REG_SIZE (-4)
> > #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
> > -#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
> >
> > /* commands to include */
>
> This results in:
> +(omap3_pandora) ../drivers/serial/serial_ns16550.c:31:2: error: #error "Console port 3 defined but not configured."
> +(omap3_pandora) #error "Console port 3 defined but not configured."
> +(omap3_pandora) ^~~~~
> +(omap3_pandora) make[2]: *** [../scripts/Makefile.build:279: drivers/serial/serial_ns16550.o] Error 1
> +(omap3_pandora) make[1]: *** [Makefile:1373: drivers/serial] Error 2
argh. I made the assumption that people who include ti_omap3_common.h
migrated to DM.
I could go back and modify ti_omap3_common.h to wrap
the CONFIG_SYS_NS16550_COMx entries under #if !defined(DM_SERIAL)
instead of CONFIG_SPL_BUILD
Do you have an opinion? I may not get back to this before I leave on
my trip, but I can take a look again in 2 weeks when I return.
Wasn't there a requirement that we need to move all boards to support
CONFIG_DM at one point?
adam
>
> --
> Tom
More information about the U-Boot
mailing list