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: 241023 List-Id: U-Boot discussion From: bmeng.cn at gmail.com (Bin Meng) Date: Tue, 7 Jul 2020 23:44:33 -0700 Subject: [PATCH 1/2] Revert "riscv: Allow use of reset drivers" Message-ID: <1594190674-818-1-git-send-email-bmeng.cn@gmail.com> 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 --- 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: 241024 List-Id: U-Boot discussion From: bmeng.cn at gmail.com (Bin Meng) Date: Tue, 7 Jul 2020 23:44:34 -0700 Subject: [PATCH 2/2] Revert "Revert "riscv: sifive: fu540: Add gpio-restart support"" In-Reply-To: <1594190674-818-1-git-send-email-bmeng.cn@gmail.com> References: <1594190674-818-1-git-send-email-bmeng.cn@gmail.com> Message-ID: <1594190674-818-2-git-send-email-bmeng.cn@gmail.com> 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