Skip to contentSkip to conversation

Revert "riscv: Allow use of reset drivers"

PATCH Superseded Bin Meng 4 participants 7 messages Jul 8, 2020 – Jul 16, 2020 1 message not in the archive

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/2 Revert "riscv: Allow use of reset drivers"

From: Bin Meng <[email protected]>

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.

---

 arch/riscv/lib/reset.c | 2 --
 1 file changed, 2 deletions(-)
arch/riscv/lib/reset.c +0 -2
index 6008bbe..8779c61 100644
@@ -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
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/2 Revert "Revert "riscv: sifive: fu540: Add gpio-restart support""

From: Bin Meng <[email protected]>

This reverts commit 23da3c682a84a2ad67a67287979dd4f5259ff607.

Now the build failure of sifive_fu540_defconfig board has been fixed, revert this "revert patch".

---

 board/sifive/fu540/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
board/sifive/fu540/Kconfig +2 -0
index 86193d7..6f65681 100644
@@ -65,5 +65,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	imply SMP
 	imply MISC
 	imply SIFIVE_OTP
+	imply SYSRESET
+	imply SYSRESET_GPIO
 
 endif
Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/2 Revert "riscv: Allow use of reset drivers"

In reply to Bin Meng
Quoted 30 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

---

 arch/riscv/lib/reset.c | 2 --
 1 file changed, 2 deletions(-)
arch/riscv/lib/reset.c +0 -1
index 6008bbe..8779c61 100644
@@ -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");

arch/riscv/lib/reset.c int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) · line 20

Quoted 4 lines
arch/riscv/lib/reset.c +0 -1
@@ -17,4 +16,3 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 
 	return 0;
 }
-#endif
author
#3 lore raw

PATCH 1/2 Revert "riscv: Allow use of reset drivers"

Hi Rick,

Quoted 32 lines · Sean Anderson
Quoted 30 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

---

 arch/riscv/lib/reset.c | 2 --
 1 file changed, 2 deletions(-)
arch/riscv/lib/reset.c +0 -1
index 6008bbe..8779c61 100644
@@ -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[])
 
Quoted 6 lines

arch/riscv/lib/reset.c int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) · line 20

Quoted 4 lines
arch/riscv/lib/reset.c +0 -1
      return 0;
 }
-#endif

Could we get this series applied soon? thanks!

Regards,
Bin

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw

PATCH 1/2 Revert "riscv: Allow use of reset drivers"

Hi Bin

Quoted 43 lines

From: Bin Meng [mailto:bmeng.cn at 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,

Quoted 34 lines · Sean Anderson
Quoted 32 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

---

 arch/riscv/lib/reset.c | 2 --
 1 file changed, 2 deletions(-)
arch/riscv/lib/reset.c index renamed from arch/riscv/lib/reset.c +0 -0

6008bbe..8779c61 100644

arch/riscv/lib/reset.c +0 -1
@@ -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[])
 
Quoted 9 lines
Quoted 6 lines

arch/riscv/lib/reset.c int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) · line 20

Quoted 4 lines
arch/riscv/lib/reset.c +0 -1
      return 0;
 }
-#endif

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 ?

Thanks,
Rick

Quoted 2 lines

Regards,
Bin

author
#6 lore raw

PATCH 1/2 Revert "riscv: Allow use of reset drivers"

Hi Rick,

Quoted 56 lines · Rick Chen

Hi Bin

Quoted 43 lines

From: Bin Meng [mailto:bmeng.cn at 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,

Quoted 34 lines · Sean Anderson
Quoted 32 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

---

 arch/riscv/lib/reset.c | 2 --
 1 file changed, 2 deletions(-)
arch/riscv/lib/reset.c index renamed from arch/riscv/lib/reset.c +0 -0

6008bbe..8779c61 100644

arch/riscv/lib/reset.c +0 -1
@@ -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[])
 
Quoted 9 lines
Quoted 6 lines

arch/riscv/lib/reset.c int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) · line 20

Quoted 4 lines
arch/riscv/lib/reset.c +0 -1
      return 0;
 }
-#endif

Could we get this series applied soon? thanks!

Quoted 8 lines

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

#7 lore raw

PATCH 1/2 Revert "riscv: Allow use of reset drivers"

In reply to Sean Anderson
Quoted 31 lines · Sean Anderson
Quoted 30 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

---

 arch/riscv/lib/reset.c | 2 --
 1 file changed, 2 deletions(-)
arch/riscv/lib/reset.c +0 -1
index 6008bbe..8779c61 100644
@@ -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[])
 
Quoted 6 lines

arch/riscv/lib/reset.c int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) · line 20

Quoted 4 lines
arch/riscv/lib/reset.c +0 -1
 	return 0;
 }
-#endif