Hi Rick, On Thu, Jul 16, 2020 at 3:06 PM Rick Chen <rickche...@gmail.com> wrote: > > Hi Bin > > > From: Bin Meng [mailto:bmeng...@gmail.com] > > Sent: Thursday, July 16, 2020 9:36 AM > > To: Sean Anderson > > Cc: Rick Jian-Zhi Chen(陳建志); Tom Rini; U-Boot Mailing List; Bin Meng > > Subject: Re: [PATCH 1/2] Revert "riscv: Allow use of reset drivers" > > > > Hi Rick, > > > > On Wed, Jul 8, 2020 at 3:04 PM Sean Anderson <sean...@gmail.com> wrote: > > > > > > On 7/8/20 2:44 AM, Bin Meng wrote: > > > > From: Bin Meng <bin.m...@windriver.com> > > > > > > > > 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 <bin.m...@windriver.com> > > > > --- > > > > > > > > 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 <command.h> > > > > #include <hang.h> > > > > > > > > -#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 <sean...@gmail.com> > > > > Could we get this series applied soon? thanks! > > > > OK. > > But [PATCH 2/2] Revert "Revert "riscv: sifive: fu540: Add gpio-restart > support"" seem conflict with Pragnesh's [PATCH 2/2] riscv: sifive: > fu540: Enable SiFive PWM driver. > > Would you please rebase with u-boot-riscv/master and send again ? >
Sure will rebase. Regards, Bin
