From patchwork Thu May 10 07:02:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen Martin X-Patchwork-Id: 158200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id A4CB4B6FA5 for ; Thu, 10 May 2012 17:03:27 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B77F02808A; Thu, 10 May 2012 09:03:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bGW4YVM5jkJS; Thu, 10 May 2012 09:03:25 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F209B28089; Thu, 10 May 2012 09:03:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4080628093 for ; Thu, 10 May 2012 09:03:18 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BoJN1RaOEl8g for ; Thu, 10 May 2012 09:03:16 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from hqemgate03.nvidia.com (hqemgate03.nvidia.com [216.228.121.140]) by theia.denx.de (Postfix) with ESMTPS id EE6BC28085 for ; Thu, 10 May 2012 09:03:14 +0200 (CEST) Received: from hqnvupgp06.nvidia.com (Not Verified[216.228.121.13]) by hqemgate03.nvidia.com id ; Thu, 10 May 2012 00:02:23 -0700 Received: from hqemhub02.nvidia.com ([172.17.108.22]) by hqnvupgp06.nvidia.com (PGP Universal service); Thu, 10 May 2012 00:03:09 -0700 X-PGP-Universal: processed; by hqnvupgp06.nvidia.com on Thu, 10 May 2012 00:03:09 -0700 Received: from badger.nvidia.com (172.20.144.16) by hqemhub02.nvidia.com (172.20.150.31) with Microsoft SMTP Server id 8.3.245.1; Thu, 10 May 2012 00:03:09 -0700 From: Allen Martin To: , , Date: Thu, 10 May 2012 00:02:22 -0700 Message-ID: <1336633347-8049-5-git-send-email-amartin@nvidia.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1336633347-8049-1-git-send-email-amartin@nvidia.com> References: <1336633347-8049-1-git-send-email-amartin@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 4/9] tegra: Add SPL build support to tegra boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Include board.c for both SPL and non-SPL build. Don't use timer_init from board.c for SPL build. Signed-off-by: Allen Martin --- board/nvidia/common/Makefile | 2 +- board/nvidia/common/board.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile index 3e748fd..ac3b9cd 100644 --- a/board/nvidia/common/Makefile +++ b/board/nvidia/common/Makefile @@ -25,7 +25,7 @@ endif LIB = $(obj)lib$(VENDOR).o -COBJS-y += board.o +COBJS-$(CONFIG_ARMCORTEXA9) += board.o COBJS-$(CONFIG_SPI_UART_SWITCH) += uart-spi-switch.o COBJS := $(COBJS-y) diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 85dd359..678a986 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -43,6 +43,7 @@ const struct tegra2_sysinfo sysinfo = { CONFIG_TEGRA2_BOARD_STRING }; +#ifndef CONFIG_SPL_BUILD /* * Routine: timer_init * Description: init the timestamp and lastinc value @@ -51,6 +52,7 @@ int timer_init(void) { return 0; } +#endif void __pin_mux_usb(void) {