From patchwork Thu Apr 20 19:12:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 752974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w87rL2yz9z9ryv for ; Fri, 21 Apr 2017 05:16:02 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OiNLRK4m"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 253D2C21C5A; Thu, 20 Apr 2017 19:12:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 28FE9C21C8B; Thu, 20 Apr 2017 19:10:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C8E20C21C82; Thu, 20 Apr 2017 19:10:27 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id 77238C21C43 for ; Thu, 20 Apr 2017 19:10:23 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id d79so210471wmi.2 for ; Thu, 20 Apr 2017 12:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eBBPHPHdWyVXIK+GZmP92izeE869yeOD4izprxUSGxY=; b=OiNLRK4mrhXc2dFJSSzIsVOBcZqGnW5UIaWR4gf5VH7TdcCFzEqv33kdL+dHsqhtJK ahv9V+FkOHbbzfGH1QWn3vfyvavaXBza41SEf99jQ5ILzy1sX2KMRBxxU9bth2KMZUgj ZRtEJHv5XZoZkbwUySSCMlrbY8ayvHazbpjjEZO1I8uSu5ovRklnwauhN6sEW+nvXSAW /Yb9Bunaud0nDZ1AfaUow+WmksUeCGOuNQW/CJlu6i1PPAokI1+4YOgYV/pCteSzQnSO KpnPSnI+vQrxMz/yOA5+KfJpEUnac3YZn6mEAjmrqQWmmh1br2b2pv+QOuyYoZPDsPhI 6xXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eBBPHPHdWyVXIK+GZmP92izeE869yeOD4izprxUSGxY=; b=sOiOijVUvE/4mDT4uVLro6hIMz9ynXfyJaNYAcpoBeXo9fEEs5LaiCcCF9lm5HzS0w iX6A4UG3K2sSiC98PHC65y/u10XMuD+goHo0E7R/XAWSfBAtNEcm5/CYVBVqhWOIxqrI fsNGwJ8360tjj+KqYDPMl7bo3A29scMWeDJ0gDg2cmo3PsHLoXhwlJMzETZBUMSk0Q38 hs75RBMNc49sVyKGtXMyvIZG/CQK3lEhOXinfa6S2mhb8yoVtaXarT8Bwm9YQFaLcQVF JlDIrcEq2tV3OVN9r+JpZMsVFsAJSHp4mDZ7vK28tLpyqkqZ5rn5OjVkZwwfRwRqfAOy aoxw== X-Gm-Message-State: AN3rC/5quLDLJzFtx6aiNN5Qk7MDKDAKO6gpbphivM2pvztU+7MxvF2J JLTSHoaPgOdsG0Nmx1Y= X-Received: by 10.28.31.200 with SMTP id f191mr4719533wmf.63.1492715422957; Thu, 20 Apr 2017 12:10:22 -0700 (PDT) Received: from skynet.lan (44.red-83-41-49.dynamicip.rima-tde.net. [83.41.49.44]) by smtp.gmail.com with ESMTPSA id b10sm50332wme.22.2017.04.20.12.10.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Apr 2017 12:10:22 -0700 (PDT) From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= To: u-boot@lists.denx.de, daniel.schwierzeck@gmail.com, sjg@chromium.org Date: Thu, 20 Apr 2017 21:12:14 +0200 Message-Id: <1492715545-3010-4-git-send-email-noltari@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1492715545-3010-1-git-send-email-noltari@gmail.com> References: <1492715545-3010-1-git-send-email-noltari@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v4 03/14] MIPS: allow using generic sysreset drivers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Avoid duplicating do_reset definition if SYSRESET is enabled for MIPS Signed-off-by: Álvaro Fernández Rojas Reviewed-by: Simon Glass --- v4: No changes. v3: No changes. v2: No changes. arch/mips/cpu/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c index 1b919ed..55e6498 100644 --- a/arch/mips/cpu/cpu.c +++ b/arch/mips/cpu/cpu.c @@ -12,6 +12,7 @@ #include #include +#ifndef CONFIG_SYSRESET void __weak _machine_restart(void) { fprintf(stderr, "*** reset failed ***\n"); @@ -26,6 +27,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } +#endif void write_one_tlb(int index, u32 pagemask, u32 hi, u32 low0, u32 low1) {