From patchwork Mon Jul 18 16:09:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Schwierzeck X-Patchwork-Id: 105321 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 4F7B0B6F71 for ; Tue, 19 Jul 2011 02:10:41 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A4BE282B1; Mon, 18 Jul 2011 18:10:34 +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 DxRSx1SgCzBU; Mon, 18 Jul 2011 18:10:34 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 49C902823B; Mon, 18 Jul 2011 18:10:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D6F1B2824B for ; Mon, 18 Jul 2011 18:09:55 +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 u4OWvxXkNlQa for ; Mon, 18 Jul 2011 18:09:55 +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 mail-fx0-f50.google.com (mail-fx0-f50.google.com [209.85.161.50]) by theia.denx.de (Postfix) with ESMTPS id 4DF6E28248 for ; Mon, 18 Jul 2011 18:09:40 +0200 (CEST) Received: by mail-fx0-f50.google.com with SMTP id 2so4395184fxh.23 for ; Mon, 18 Jul 2011 09:09:40 -0700 (PDT) Received: by 10.223.55.8 with SMTP id s8mr10257270fag.141.1311005380150; Mon, 18 Jul 2011 09:09:40 -0700 (PDT) Received: from localhost.localdomain (dslb-088-073-241-042.pools.arcor-ip.net [88.73.241.42]) by mx.google.com with ESMTPS id r12sm3027082fam.0.2011.07.18.09.09.37 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Jul 2011 09:09:38 -0700 (PDT) From: Daniel Schwierzeck To: u-boot@lists.denx.de Date: Mon, 18 Jul 2011 18:09:17 +0200 Message-Id: <1311005361-26241-6-git-send-email-daniel.schwierzeck@googlemail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1311005361-26241-1-git-send-email-daniel.schwierzeck@googlemail.com> References: <1310569869-31810-1-git-send-email-daniel.schwierzeck@googlemail.com> <1311005361-26241-1-git-send-email-daniel.schwierzeck@googlemail.com> Subject: [U-Boot] [PATCH v3 5/9] arm: adjust PLATFORM_LIBS for SPL X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 From: Aneesh V Signed-off-by: Aneesh V Cc: Albert ARIBAUD --- Changes since RFC v1: - none arch/arm/config.mk | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 788d4c1..9184d06 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -56,9 +56,14 @@ PLATFORM_CPPFLAGS += $(call cc-option,\ # For EABI, make sure to provide raise() ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS))) -# This file is parsed several times; make sure to add only once. -ifeq (,$(findstring arch/arm/lib/eabi_compat.o,$(PLATFORM_LIBS))) -PLATFORM_LIBS += $(OBJTREE)/arch/arm/lib/eabi_compat.o +# This file is parsed several times, with or without CONFIG_SPL_BUILD set +# Make sure to add only once and with the correct prefix +ifdef CONFIG_SPL_BUILD +PLATFORM_LIBS := $(SPLTREE)/arch/arm/lib/eabi_compat.o \ + $(filter-out %/arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS)) +else +PLATFORM_LIBS := $(OBJTREE)/arch/arm/lib/eabi_compat.o \ + $(filter-out %/arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS)) endif endif