summaryrefslogtreecommitdiff
path: root/board/nvidia/seaboard
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-10-22 06:19:35 +0000
committerTom Warren <twarren@nvidia.com>2012-10-29 09:07:05 -0700
commitda1f735272aaccf201b7d289c86fe8c6ff848f4f (patch)
tree89d4acdb84b3390a9672e9e71dd52484e207fac6 /board/nvidia/seaboard
parent644a69ec85a73b4d24c3a7b0369da76e2c336bce (diff)
downloadu-boot-imx-da1f735272aaccf201b7d289c86fe8c6ff848f4f.zip
u-boot-imx-da1f735272aaccf201b7d289c86fe8c6ff848f4f.tar.gz
u-boot-imx-da1f735272aaccf201b7d289c86fe8c6ff848f4f.tar.bz2
ARM: tegra: select between Seaboard/Ventana at compile time
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> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'board/nvidia/seaboard')
-rw-r--r--board/nvidia/seaboard/seaboard.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index 4e8a183..ea431e9 100644
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -34,7 +34,7 @@
#endif
/* TODO: Remove this code when the SPI switch is working */
-#ifndef CONFIG_SPI_UART_SWITCH
+#if !defined(CONFIG_SPI_UART_SWITCH) && (CONFIG_MACH_TYPE != MACH_TYPE_VENTANA)
/*
* Routine: gpio_config_uart_seaboard
* Description: Force GPIO_PI3 low on Seaboard so UART4 works.
@@ -48,8 +48,6 @@ static void gpio_config_uart_seaboard(void)
void gpio_early_init_uart(void)
{
- if (machine_is_ventana())
- return;
gpio_config_uart_seaboard();
}
#endif