Message ID | 1594190674-818-1-git-send-email-bmeng.cn@gmail.com |
---|---|
State | New |
Headers | show |
Series | [1/2] Revert "riscv: Allow use of reset drivers" | expand |
On 7/8/20 2:44 AM, Bin Meng wrote: > From: Bin Meng <bin.meng at 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.meng at 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 <seanga2 at gmail.com>
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