X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Fmach-tegra%2Fboard.c;h=40de72dc575fd1a84d097461edeb251fa04c12b5;hb=a0942a6d3e08490be2871396c977fb5520ecdf33;hp=f11304149e08d8869e6c6afd884f2f47e6a4f667;hpb=32b3234f09bc4d1e60f4972cc2ecbbf807e228dc;p=u-boot diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index f11304149e..40de72dc57 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2010-2014 + * (C) Copyright 2010-2015 * NVIDIA Corporation * * SPDX-License-Identifier: GPL-2.0+ @@ -18,6 +18,8 @@ #include #include +void save_boot_params_ret(void); + DECLARE_GLOBAL_DATA_PTR; enum { @@ -141,12 +143,18 @@ static int uart_configs[] = { -1, FUNCMUX_UART4_GMI, /* UARTD */ -1, -#else /* Tegra124 */ +#elif defined(CONFIG_TEGRA124) FUNCMUX_UART1_KBC, /* UARTA */ -1, -1, FUNCMUX_UART4_GPIO, /* UARTD */ -1, +#else /* Tegra210 */ + FUNCMUX_UART1_UART1, /* UARTA */ + -1, + -1, + FUNCMUX_UART4_UART4, /* UARTD */ + -1, #endif };