From patchwork Mon Jul 20 03:06:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1331997 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=iFvRPUF/; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B968T54KXz9sR4 for ; Mon, 20 Jul 2020 13:07:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1059181C0D; Mon, 20 Jul 2020 05:06:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iFvRPUF/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE9A681EE4; Mon, 20 Jul 2020 05:06:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CC13681BDE for ; Mon, 20 Jul 2020 05:06:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pj1-x1044.google.com with SMTP id ch3so9455950pjb.5 for ; Sun, 19 Jul 2020 20:06:52 -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; bh=bHWkX0XsqThVBxBlRrP6M416HmMVLnAmx+6Tpamj1K0=; b=iFvRPUF/G8ce9+9q1Pw2+2I4+D2HqBUrztF/PYgJ3Wp3r74iClAdpmws6ezwHr5toe dH0fPxKTYHpW7X9A0O5APDqEPpwY2ThIQ61MeW4oIyYaLgndOMAdFILmj+NiVlUnkhNv SOvgYdoM8jm8EPqHAbL6Z09KytY6dgKu5cE+HOmln0JflYddMKXnKT0WHstyyz+iopk6 iwGYXNBSn6osqem7KEjaDZnGz5DkwLJbii8w2Lur2A5XOBml0z4VMETjUVGxtVRZp1Lf FdTyiMU6KdN1CyNSGJm4BzDKbfXxtwu8oyYWKDt1nXQRn+osno0qo5WvqS/A6nYZYRU8 DuVA== 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; bh=bHWkX0XsqThVBxBlRrP6M416HmMVLnAmx+6Tpamj1K0=; b=GXykURQtNktAMQw76dyJd0c0izk7P1SDHM8JGHBvxKud6G637AVNoiliieM7R1D136 gB0IWYr3hiNTJhNWUIyv9QRQgN7lvIl453vc1vPZ//2KWIdxYP40GPYVItD7EaHRDGSz +ZwnBt8dKtnmFA/qIXPc2sWU0RZ86/5UvPrGQkHrDjowazq/sxWticSUv9jEU3cA/IsH epvudkIsy24g1ujeiKSDsFBhqtFPysi7pPLCAcu4ddKeq3m/9dNyQ8QNeXhPpoGMsFdT 08TX5McZKkrZ6V6JgFAb0thBC1iwCkvzVj5UB1yl8qAGVGMyesXLTXyhEmNXMy/XAKHn RE/A== X-Gm-Message-State: AOAM533VAeIK6II9x91NHPdZMCKU0KrCNasLCTgt4PPDCr33Sx43Hh1r 2rXUFClOHlfaS0QlFmqAFoc= X-Google-Smtp-Source: ABdhPJxrIiogIVUJa+4b8GmjcpKYn2S6XYYfpqbddU/G4N9C8VVsTx+wfu0bEQxY9LMAKvdJamZWlQ== X-Received: by 2002:a17:902:d698:: with SMTP id v24mr16089352ply.163.1595214411205; Sun, 19 Jul 2020 20:06:51 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id a9sm15201967pfr.103.2020.07.19.20.06.50 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 19 Jul 2020 20:06:50 -0700 (PDT) From: Bin Meng To: Rick Chen , Tom Rini , Sean Anderson , U-Boot Mailing List Cc: Bin Meng Subject: [PATCH v2 1/2] Revert "riscv: Allow use of reset drivers" Date: Sun, 19 Jul 2020 20:06:45 -0700 Message-Id: <1595214406-15869-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Bin Meng This reverts commit 958a3f464c7f8ef7e10db9feb663e9e80445ce2f. A more appropriate change below is already in mainline. Commit fd31e4fd184f ("riscv: Do not build reset.c if SYSRESET is on") Revert this patch, so that U-Boot can be built successfully for SiFive Fu540 board. Signed-off-by: Bin Meng Reviewed-by: Sean Anderson Reviewed-by: Leo Liang --- (no changes since v1) arch/riscv/lib/reset.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/riscv/lib/reset.c b/arch/riscv/lib/reset.c index 6008bbe..8779c61 100644 --- a/arch/riscv/lib/reset.c +++ b/arch/riscv/lib/reset.c @@ -7,7 +7,6 @@ #include #include -#ifndef CONFIG_SYSRESET int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { printf("resetting ...\n"); @@ -17,4 +16,3 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return 0; } -#endif