From patchwork Tue Dec 20 20:54:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 132516 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 62D5DB709F for ; Wed, 21 Dec 2011 07:55:21 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B163328110; Tue, 20 Dec 2011 21:55:19 +0100 (CET) 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 dqy6aeUdBh5O; Tue, 20 Dec 2011 21:55:18 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 130F228089; Tue, 20 Dec 2011 21:55:17 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E7BFB28089 for ; Tue, 20 Dec 2011 21:55:15 +0100 (CET) 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 7wNRVhb-4Rvk for ; Tue, 20 Dec 2011 21:55:15 +0100 (CET) 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 mail-iy0-f172.google.com (mail-iy0-f172.google.com [209.85.210.172]) by theia.denx.de (Postfix) with ESMTPS id 1480C2807F for ; Tue, 20 Dec 2011 21:55:14 +0100 (CET) Received: by iaen33 with SMTP id n33so2158651iae.3 for ; Tue, 20 Dec 2011 12:55:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=rBGCWuMt7rKR+/+8Qww5sGzxGEfiosEaBgg/OSukClQ=; b=PEpBgbx2JGU1t6hns/xyJL7mVya0T7fNemAS8ByRHHigevJcHuyrdWecio5qEJ35lH x5hY0wyEl+5yU6NH9ZPpSa/2Tuh/GZvEs5p+YfeGsvZ2379Q5sadjv8YnmeVoWqn/OBP o+SV8pVodmAzYWlgKlkIN4d+KLLK1dYSFxpyg= Received: by 10.42.151.65 with SMTP id d1mr3787343icw.18.1324414513041; Tue, 20 Dec 2011 12:55:13 -0800 (PST) Received: from localhost.localdomain (ip68-106-253-43.ph.ph.cox.net. [68.106.253.43]) by mx.google.com with ESMTPS id wo4sm3685750igc.5.2011.12.20.12.55.09 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Dec 2011 12:55:11 -0800 (PST) From: Tom Warren To: u-boot@lists.denx.de Date: Tue, 20 Dec 2011 13:54:25 -0700 Message-Id: <1324414465-7999-1-git-send-email-twarren@nvidia.com> X-Mailer: git-send-email 1.7.7.1 Cc: Tom Warren , twarren.nvidia@gmail.com Subject: [U-Boot] [PATCH V2] arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Seaboard changes have removed the need for common/board.o in the Makefile. Propagate this change to the other Tegra2 builds. Signed-off-by: Tom Warren Acked-by: Stephen Warren Tested-by: Stephen Warren --- V2: Add more info to commit msg about use/source of change board/nvidia/harmony/Makefile | 1 - board/nvidia/ventana/Makefile | 3 +-- include/configs/ventana.h | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/board/nvidia/harmony/Makefile b/board/nvidia/harmony/Makefile index f6599de..b6efa1c 100644 --- a/board/nvidia/harmony/Makefile +++ b/board/nvidia/harmony/Makefile @@ -31,7 +31,6 @@ endif LIB = $(obj)lib$(BOARD).o COBJS := $(BOARD).o -COBJS += ../common/board.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/nvidia/ventana/Makefile b/board/nvidia/ventana/Makefile index 9e5a87f..b4ab79a 100644 --- a/board/nvidia/ventana/Makefile +++ b/board/nvidia/ventana/Makefile @@ -30,8 +30,7 @@ endif LIB = $(obj)lib$(BOARD).o -COBJS += ../seaboard/seaboard.o -COBJS += ../common/board.o +COBJS = ../seaboard/seaboard.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/include/configs/ventana.h b/include/configs/ventana.h index afd6ff6..acc9b43 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -52,4 +52,7 @@ #define CONFIG_EFI_PARTITION #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT + +/* Environment not stored */ +#define CONFIG_ENV_IS_NOWHERE #endif /* __CONFIG_H */