diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 20:13:48 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 20:13:48 +0200 |
commit | 94b972d366c29b92319865e3ded16da062aa8507 (patch) | |
tree | 2948fd62cdd789f182775f5d7d576ac9b7b025e5 /board/nvidia/common | |
parent | dda0dbfc69f3d560c87f5be85f127ed862ea6721 (diff) | |
parent | d381294aef4a5b6ddeda3685519330a5b73d884f (diff) | |
download | u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.zip u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.tar.gz u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.tar.bz2 |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/nvidia/common')
-rw-r--r-- | board/nvidia/common/board.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 3b18e28..d01abce 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -31,7 +31,6 @@ #endif #ifdef CONFIG_USB_EHCI_TEGRA #include <asm/arch-tegra/usb.h> -#include <asm/arch/usb.h> #include <usb.h> #endif #ifdef CONFIG_TEGRA_MMC @@ -48,6 +47,12 @@ const struct tegra_sysinfo sysinfo = { CONFIG_TEGRA_BOARD_STRING }; +void __pinmux_init(void) +{ +} + +void pinmux_init(void) __attribute__((weak, alias("__pinmux_init"))); + void __pin_mux_usb(void) { } @@ -176,9 +181,7 @@ void gpio_early_init(void) __attribute__((weak, alias("__gpio_early_init"))); int board_early_init_f(void) { -#if !defined(CONFIG_TEGRA20) pinmux_init(); -#endif board_init_uart_f(); /* Initialize periph GPIOs */ |