summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Warren <twarren.nvidia@gmail.com>2014-01-24 12:46:11 -0700
committerTom Warren <twarren@nvidia.com>2014-02-03 09:46:46 -0700
commitdcd12518b1eb54f311d340fb1ee60aa2a5da9c3b (patch)
tree0e7dbde010f536cc2bd963f44efcc995e54d785c /board
parenta4bcd67c72aabfcc2153f4393cd9108b860d9040 (diff)
downloadu-boot-imx-dcd12518b1eb54f311d340fb1ee60aa2a5da9c3b.zip
u-boot-imx-dcd12518b1eb54f311d340fb1ee60aa2a5da9c3b.tar.gz
u-boot-imx-dcd12518b1eb54f311d340fb1ee60aa2a5da9c3b.tar.bz2
ARM: tegra: only build __pinmux_nand() when it's needed
__pinmux_nand() won't compile if PERIPH_ID_NDFLASH isn't defined. Prevent this from causing build problems on newer SoCs without NAND support (or without SW support for NAND yet), but preventing compilation unless the function will actually be used, i.e. when CONFIG_TEGRA_NAND is defined. Signed-off-by: Tom Warren <twarren@nvidia.com> [swarren, rewrote commit description, moved ifdef around whole function rather than just body] Signed-off-by: Stephen Warren <swarren@nvidia.com> Tested-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'board')
-rw-r--r--board/nvidia/common/board.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index e650fed..3b18e28 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -67,12 +67,14 @@ void __gpio_early_init_uart(void)
void gpio_early_init_uart(void)
__attribute__((weak, alias("__gpio_early_init_uart")));
+#if defined(CONFIG_TEGRA_NAND)
void __pin_mux_nand(void)
{
funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_DEFAULT);
}
void pin_mux_nand(void) __attribute__((weak, alias("__pin_mux_nand")));
+#endif
void __pin_mux_display(void)
{