summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorAllen Martin <amartin@nvidia.com>2012-08-31 08:30:08 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-01 14:58:21 +0200
commit45ec5b2579e8f9e58f58d9face9147957e5a873e (patch)
treea1932a58f5a05948ec750fb9a35eb6c96d4c8c11 /board
parentc7da6c6757aa17bb6130833b0e1e7e2a068ea2f6 (diff)
downloadtalos-obmc-uboot-45ec5b2579e8f9e58f58d9face9147957e5a873e.tar.gz
talos-obmc-uboot-45ec5b2579e8f9e58f58d9face9147957e5a873e.zip
tegra20: remove timer_init from SPL build
Don't use timer_init from tegra board.c. This comes out of arm720t for the SPL build. Signed-off-by: Allen Martin <amartin@nvidia.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> 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 d1a7f3a21c..6753f950f7 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -49,6 +49,7 @@ const struct tegra20_sysinfo sysinfo = {
CONFIG_TEGRA20_BOARD_STRING
};
+#ifndef CONFIG_SPL_BUILD
/*
* Routine: timer_init
* Description: init the timestamp and lastinc value
@@ -57,6 +58,7 @@ int timer_init(void)
{
return 0;
}
+#endif
void __pin_mux_usb(void)
{
OpenPOWER on IntegriCloud