From patchwork Thu Feb 14 14:18:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 220454 X-Patchwork-Delegate: sjg@chromium.org 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 4A29E2C0084 for ; Fri, 15 Feb 2013 01:25:14 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AE9154A0AD; Thu, 14 Feb 2013 15:25:12 +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 NV4QcmBtg3wx; Thu, 14 Feb 2013 15:25:12 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 435564A0C0; Thu, 14 Feb 2013 15:25:11 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 142364A0AE for ; Thu, 14 Feb 2013 15:25:08 +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 CN-ggtWa3hLo for ; Thu, 14 Feb 2013 15:25:05 +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-vc0-f202.google.com (mail-vc0-f202.google.com [209.85.220.202]) by theia.denx.de (Postfix) with ESMTPS id A47814A0AD for ; Thu, 14 Feb 2013 15:25:03 +0100 (CET) Received: by mail-vc0-f202.google.com with SMTP id m8so243066vcd.5 for ; Thu, 14 Feb 2013 06:25:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=dAQ3OBGPIouzI5+CBkma0HLWxqLzPOqjicRRgKVa/Wo=; b=hKSNfA9yAvzJpE27AdhPfOKoFoi4FPpLdXqW6n/57Mzu5KTcedf04eWGHqgT8UbGPh Ocu+0vIGeBF4ZSDnOrmh65Df+7cReFkZcogc17kOTZ9u/R7Y8/vfDimIUOPSTZAJyS/x K4hERzpQybvG0sHaKZgrKBnxVLCir/tVkiMIZu19QZGpldfkbocZQ6v6LZ2vcnZSODxt Wcnarg+eG7dtK8V5uCch3obWZWIM2uCcG1/mWAFUkfJUpTXCrtE2gbjDgmcbTvFmdt1X 1jnFjE5jEg6dVhaALtQhocIvp0jLPmXub9HkP1J+pLMdXkgz4Ak/fuhwa33fzQgv91Wh 4h+g== X-Received: by 10.236.9.10 with SMTP id 10mr12205212yhs.44.1360851542113; Thu, 14 Feb 2013 06:19:02 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id y44si1323069yhl.5.2013.02.14.06.19.02 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Thu, 14 Feb 2013 06:19:02 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id EE9B731C2C8; Thu, 14 Feb 2013 06:19:01 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id A0E1716095C; Thu, 14 Feb 2013 06:19:01 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 14 Feb 2013 06:18:53 -0800 Message-Id: <1360851535-23805-4-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1360851535-23805-1-git-send-email-sjg@chromium.org> References: <1360851535-23805-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQkZ/TXsLie1WRPzhCUGCB7vtZTCo56HNKFrXAKO0uGjpyddnkNNT4omCVxoPTsR3mn3QRsQC20fwbADsiAhRCUlK0BCGrNPmO6Q3mRiUtyul7dYDNLolRTAfNyVQC7dG34vB6NNwAs51yCrk3A4CHW+2ZIufqE164DlASDELpNq3SxKa6LzpX53pcWJO+rzpIRCS5Zk Cc: Graeme Russ , Vadim Bendebury , Stefan Reinauer Subject: [U-Boot] [PATCH v2 3/5] x86: Remove unneeded cruft from main Makefile 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 These lines are dealt with in the x86 Makefile and link script, so punt them. Signed-off-by: Simon Glass Acked-by: Gabe Black --- Changes in v2: - Add new patch to tidy up main Makefile Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 35eee70..fc18dd4 100644 --- a/Makefile +++ b/Makefile @@ -230,10 +230,6 @@ endif # U-Boot objects....order is important (i.e. start must be first) OBJS = $(CPUDIR)/start.o -ifeq ($(CPU),x86) -RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += $(CPUDIR)/start16.o -RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += $(CPUDIR)/resetvec.o -endif ifeq ($(CPU),ppc4xx) OBJS += $(CPUDIR)/resetvec.o endif @@ -241,7 +237,7 @@ ifeq ($(CPU),mpc85xx) OBJS += $(CPUDIR)/resetvec.o endif -OBJS := $(addprefix $(obj),$(OBJS) $(RESET_OBJS-)) +OBJS := $(addprefix $(obj),$(OBJS)) HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)