From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Liang Date: Thu, 16 Jul 2020 12:10:32 +0800 Subject: [PATCH 1/2] Revert "riscv: Allow use of reset drivers" In-Reply-To: References: <1594190674-818-1-git-send-email-bmeng.cn@gmail.com> Message-ID: <20200716041031.GA6513@andestech.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, Jul 08, 2020 at 03:04:42AM -0400, Sean Anderson wrote: > On 7/8/20 2:44 AM, Bin Meng wrote: > > 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 > > --- > > > > 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 > > > > Reviewed-by: Sean Anderson Reviewed-by: Leo Liang