| Message ID | 1440429171-2555-9-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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 6F831140280 for <incoming@patchwork.ozlabs.org>; Tue, 25 Aug 2015 01:15:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=Nnma88WV; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9F5624B6CE; Mon, 24 Aug 2015 17:14:44 +0200 (CEST) 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 sXpMLxyCslPO; Mon, 24 Aug 2015 17:14:44 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4C6864B6F6; Mon, 24 Aug 2015 17:14:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2B0254B669 for <u-boot@lists.denx.de>; Mon, 24 Aug 2015 17:13:55 +0200 (CEST) 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 OfeyZBAfjbaD for <u-boot@lists.denx.de>; Mon, 24 Aug 2015 17:13: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-ig0-f173.google.com (mail-ig0-f173.google.com [209.85.213.173]) by theia.denx.de (Postfix) with ESMTPS id 31B134B6BD for <u-boot@lists.denx.de>; Mon, 24 Aug 2015 17:13:51 +0200 (CEST) Received: by igfj19 with SMTP id j19so58462031igf.1 for <u-boot@lists.denx.de>; Mon, 24 Aug 2015 08:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=C7+nq0nY7nuMpgohXdE0CweZvRw//F0XYrJDZnWZ3Xw=; b=Nnma88WV3AjUSLi0u98QqBLo97o+6y74k/TOaFmlf8L251ZFO2mi4XAtY6+X1US6jp UAW/i/ApXLrxS02+GdVbn286d6Lpg9DA6SUoq5VdaTt9gwS8QH7HuMjy1hfixMb4fdNz q9PWP6Tf2q7fs8vOZ3mX2vXXMF2Ob6wpQYFX36rzrAFC232091Y7l9EYVzhvohXCp4oO wjxIPsBZzWmBJLS/3J6pLPS7SdxTQTse61D1rjISb+DGfDYxGXrklnr2p+daJKIHxaXc gtrsRv/ytUXILLecS2rR7ASU3RbXsXBRBVfmBFdPu40O0aLzJvDVtg/UQ5+WvLdHcW4U ac5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=C7+nq0nY7nuMpgohXdE0CweZvRw//F0XYrJDZnWZ3Xw=; b=MzNh3q/4WIDpTpAufiUeFedrugCmYWx3ESM98u+/YrQa/+rLdYaPo6nwi0W/ZC1jxY 42WioukbJCAny9uxBfaQ1kSvz/sKjM4SgfHU0FyEJ04OVD6E4ZYuCBN3mN3XL71HbxmC vDwXbcmfFOQb7+lz+IrxDQiYgPfYEljBr0E0RL4p23PMekVfpIev+uyd0WogX8qCDpWY CjcFRPcSAMjcLG4pWRABWz2hFqy1p4CKEp0IJdANo0/ItiMbPHJNk4zVNNpiHimdY8xg erTq10vhNNNiPWohEqLOkf2lTm6piRYyl/RWEP5yd4/ugBV+aUn6JFLs9mKFEs+sWdRk AFXQ== X-Gm-Message-State: ALoCoQmjDkM7a2nTXBEYlVtLS++EyHUgUpmN9r+NHlsnDYt4xY2l39FlZorKiiaU4YnaUBBCSvih X-Received: by 10.50.143.12 with SMTP id sa12mr14060718igb.64.1440429230194; Mon, 24 Aug 2015 08:13:50 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:8556:c3c2:10e:e01d]) by smtp.gmail.com with ESMTPSA id cr1sm8999735igb.15.2015.08.24.08.13.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2015 08:13:41 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id BA2DE22167F; Mon, 24 Aug 2015 09:13:33 -0600 (MDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Mon, 24 Aug 2015 09:12:26 -0600 Message-Id: <1440429171-2555-9-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.5.0.457.gab17608 In-Reply-To: <1440429171-2555-1-git-send-email-sjg@chromium.org> References: <1440429171-2555-1-git-send-email-sjg@chromium.org> Cc: huangtao <huangtao@rock-chips.com>, Andre Przywara <andre.przywara@arm.com>, cwx <cwz@rock-chips.com> Subject: [U-Boot] [PATCH v4 08/33] arm: reset: Avoid a build error when the reset uclass is enabled X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 31a5c8d..15e74bd 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -47,7 +47,9 @@ obj-y += interrupts_64.o else obj-y += interrupts.o endif +ifndef CONFIG_RESET obj-y += reset.o +endif obj-y += cache.o ifndef CONFIG_ARM64
There can be only one do_reset(). When CONFIG_RESET is enabled this is provided by the reset uclass, and ARM's version should be disabled. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v4: None Changes in v3: None Changes in v2: None arch/arm/lib/Makefile | 2 ++ 1 file changed, 2 insertions(+)