| Message ID | 1449244720-19253-3-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On 2015年12月04日 23:58, Simon Glass wrote: > At present an incorrect #if term is preventing this data from being compiled > in. All tegra boards use driver model for serial, so we can just drop this. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Reported-by: Stephen Warren <swarren@nvidia.com> > --- > > arch/arm/mach-tegra/board.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Acked-by: Thomas Chou <thomas@wytron.com.tw>
On Fri, Dec 04, 2015 at 08:58:39AM -0700, Simon Glass wrote: > At present an incorrect #if term is preventing this data from being compiled > in. All tegra boards use driver model for serial, so we can just drop this. > > Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig") > Signed-off-by: Simon Glass <sjg@chromium.org> > Reported-by: Stephen Warren <swarren@nvidia.com> > Acked-by: Thomas Chou <thomas@wytron.com.tw> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index 8c8927d..3d1d26d 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -214,7 +214,7 @@ void board_init_uart_f(void) setup_uarts(uart_ids); } -#if CONFIG_IS_ENABLED(DM_SERIAL) && !CONFIG_IS_ENABLED(OF_CONTROL) +#if !CONFIG_IS_ENABLED(OF_CONTROL) static struct ns16550_platdata ns16550_com1_pdata = { .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2,
At present an incorrect #if term is preventing this data from being compiled in. All tegra boards use driver model for serial, so we can just drop this. Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: Stephen Warren <swarren@nvidia.com> --- arch/arm/mach-tegra/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)