From patchwork Wed Jul 8 06:44:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1325017 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=C+LfC7CZ; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B1qYw75H5z9sRK for ; Wed, 8 Jul 2020 16:45:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 29DDC821D6; Wed, 8 Jul 2020 08:45:20 +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="C+LfC7CZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 724A782239; Wed, 8 Jul 2020 08:45:18 +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-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) (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 575E982198 for ; Wed, 8 Jul 2020 08:45:15 +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-x1043.google.com with SMTP id md7so761719pjb.1 for ; Tue, 07 Jul 2020 23:45:15 -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=juU/4xK59pjtqC5pq7QnaCqMmWxx2nStqOJNNzz+jL8=; b=C+LfC7CZf+yG0EWoKmuIXh0oaUfTU5yRZP7SdyT9W6hRgE1PLfjnPghOWM03q3ODkb klGSaVW5YvjlNdl/E1uFReZ5CdW/djtzhfUBrOLMExerrtx4IK9qevjmA60MbEbbAfZs QhCB5ztaX9HNPC4uA8fT5hBluQM8mbgNFTbJUx+tnISafFv7ZrtGsS6IOVFw0KugPSOg xRbP1JqSTujHkiOyZDbp5/57F99OX7Or9U66J8UV8k0s2gTK/sfo5Ie5xzXl1VpfrP92 bd+CLYufTR2Du6KFdLNhYhNog7hd8VGi1D5peayBXm4dPsAQdC68EhMoweS5oYsMvjUh lsNw== 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=juU/4xK59pjtqC5pq7QnaCqMmWxx2nStqOJNNzz+jL8=; b=UN8x1YNMfob4+AO3cZS9FfvIr7tMjF0KEWBdmbIERqdEXtH4td6iNqtP+6kIN2SETG 7bf1t0/MOrgMOi+efgVz/4xu2OmolTSYxjp98+gHYzkZeXq2oOAvwDqC25JuhzJD5V5C 863ilQeBdPLPxFeYfZOZiFeS5xXCsUOi8AabaKEMTDWh2K4jZeHIrRGdwxDoFsDfpSXJ 8jq02WghaSe2KULcHajLpvwDq5w6zeX00ZoHAuk/xfYk4db51Pjn4FkNy9CNzmoXPlKu OUTuXXCWCQatzifz/f9vm/8EbzV3zRsp08oHdX21agRxBzw3GXDdeqSFlYT8KHvZMuxN oN5g== X-Gm-Message-State: AOAM530Cb3xbYaPx5nRMFxCo6T0DDsBqPkCyo5sKIWIR4tX60jTx+5DL QNubHvN/bBwMgCNF6Laonr1GDHNh X-Google-Smtp-Source: ABdhPJyoH/0VmKLQiINAHKlTScO5DaJ24uISs3UlgZ5p8nlJEmTC4CQJ4Q3rEQhgV+cpxUf8v0pfjA== X-Received: by 2002:a17:90a:1f08:: with SMTP id u8mr8336804pja.154.1594190714016; Tue, 07 Jul 2020 23:45:14 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id m20sm25447399pfk.52.2020.07.07.23.45.13 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 07 Jul 2020 23:45:13 -0700 (PDT) From: Bin Meng To: Rick Chen , Tom Rini , Sean Anderson , U-Boot Mailing List Cc: Bin Meng Subject: [PATCH 1/2] Revert "riscv: Allow use of reset drivers" Date: Tue, 7 Jul 2020 23:44:33 -0700 Message-Id: <1594190674-818-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 --- 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 From patchwork Wed Jul 8 06:44:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1325018 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=bdGtMDbB; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B1qZ51h55z9sRW for ; Wed, 8 Jul 2020 16:45:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 33793821F9; Wed, 8 Jul 2020 08:45:24 +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="bdGtMDbB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D309821F9; Wed, 8 Jul 2020 08:45:19 +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-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (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 3EF49821D6 for ; Wed, 8 Jul 2020 08:45:16 +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-pl1-x641.google.com with SMTP id d10so5740291pll.3 for ; Tue, 07 Jul 2020 23:45:16 -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; bh=+InugjIkAMZ3kM1Dk8Kqc/vRNy9un9P324BDd8+KfXE=; b=bdGtMDbB73kVFs1DHq5rB6NLYAjcml2Kw+B5YJTjPcInG95azmEP5bq354TODfwq7J 0kqsX+fOtAO4r+YPUvgdJw39TyqBNQ/nWyjso4yJJZyyCy++yu9kCNstSCJTnKiMTskB +UkNtNBlBVX0+tMcvcNlS7WcGqqHbd5wKT5qr9kkig1P0OaLJh3O6gKLZFeHd1vDbirT zonc2dKNrJvnufV32eQpDERwuXdi58kM+aM6fEhVHjFGf53sUQuxe/vMdEXxLEAWKU6Q ZJgKn25/Mqk4XjI7euo5q+0/rHcZwIiBjZfr7pbHX3vF3Wa0K2mlxJB+xhQFaW4Olqqx jIFg== 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; bh=+InugjIkAMZ3kM1Dk8Kqc/vRNy9un9P324BDd8+KfXE=; b=RDMzBAuOVzQWZyRO0yj/MGf0W5683vz7B4gln5oyb+8Zp+TeFIqgy6NAN9yvab/70l GXO3fbmzvBB6+pcOQlPfWMHbrxiGJeR0vEcMQQ4nejBmBJb0FHjAVa9srGfaU7Sv2Uj5 8A5TFmt1rB1w2Eq2DpWPaLhP5a9MiPqQfl27eyAPuynvIRdC+1xHVYFOoLireS8hUXsI tTnkQBILqJlTUhaPrP5OJ6+2i+u9+YnHzd33FFRSy7ph6DKlqpXmi2Ih5DP1TlnEzThD iVfyFA/IIrXhqmEjxmZDYVywwCNlohFnHz5rxyZ0NO54CxZQUHdwl8SK7s+GQ5UOqgRr ra/Q== X-Gm-Message-State: AOAM530OKLAKTy6i2wNgNKfNb5BTsXkDqkY5gYyOsVNnah+UwI5/bBsI UKiZhCT6R7oUkJBuSCXqHao= X-Google-Smtp-Source: ABdhPJyztPHKm4Nb7gE/xwapb3/cA6NgJuG7fq+iaL333hX0MXwmJdhfdyefjk5WG95uNtbJX/gCqQ== X-Received: by 2002:a17:902:76c4:: with SMTP id j4mr26566912plt.131.1594190714824; Tue, 07 Jul 2020 23:45:14 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id m20sm25447399pfk.52.2020.07.07.23.45.14 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 07 Jul 2020 23:45:14 -0700 (PDT) From: Bin Meng To: Rick Chen , Tom Rini , Sean Anderson , U-Boot Mailing List Cc: Bin Meng Subject: [PATCH 2/2] Revert "Revert "riscv: sifive: fu540: Add gpio-restart support"" Date: Tue, 7 Jul 2020 23:44:34 -0700 Message-Id: <1594190674-818-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594190674-818-1-git-send-email-bmeng.cn@gmail.com> References: <1594190674-818-1-git-send-email-bmeng.cn@gmail.com> 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 23da3c682a84a2ad67a67287979dd4f5259ff607. Now the build failure of sifive_fu540_defconfig board has been fixed, revert this "revert patch". Signed-off-by: Bin Meng --- board/sifive/fu540/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sifive/fu540/Kconfig b/board/sifive/fu540/Kconfig index 86193d7..6f65681 100644 --- a/board/sifive/fu540/Kconfig +++ b/board/sifive/fu540/Kconfig @@ -65,5 +65,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply SMP imply MISC imply SIFIVE_OTP + imply SYSRESET + imply SYSRESET_GPIO endif