[U-Boot] [PATCH V2 4/5] ARM: tegra: select between Seaboard/Ventana at compile time

Simon Glass
2012-10-19T19:51:55Z

Hi Stephen,

On Thu, Oct 18, 2012 at 4:25 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> Seaboard and Ventana are very similar boards, and so share the seaboard.c
> board file. The one difference needed so far is detected at run-time by
> calling machine_is_ventana(). This bloats the Ventana build with code
> that is never used. Switch to detecting Ventana at compile time to remove
> bloat. This shaves ~5K off the SPL size on Ventana, and makes the SPL fit
> within the max size.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> v2: New patch to replace modification of CONFIG_SYS_TEXT_BASE.
> ---
> board/nvidia/seaboard/seaboard.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
> index 4e8a183..6dce57f 100644
> --- a/board/nvidia/seaboard/seaboard.c
> +++ b/board/nvidia/seaboard/seaboard.c
> @@ -35,6 +35,7 @@
>
> /* TODO: Remove this code when the SPI switch is working */
> #ifndef CONFIG_SPI_UART_SWITCH
> +#if CONFIG_MACH_TYPE != MACH_TYPE_VENTANA

I guess this forks the board type again, so that it is no longer
defined by the fdt. Is that what you intend, or do I have it wrong?

> /*
> * Routine: gpio_config_uart_seaboard
> * Description: Force GPIO_PI3 low on Seaboard so UART4 works.
> @@ -48,11 +49,10 @@ static void gpio_config_uart_seaboard(void)
>
> void gpio_early_init_uart(void)
> {
> - if (machine_is_ventana())
> - return;
> gpio_config_uart_seaboard();
> }
> #endif
> +#endif
>
> #ifdef CONFIG_TEGRA_MMC
> /*
> --
> 1.7.0.4
>

Regards,
Simon