Skip to contentSkip to conversation

arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10

PATCH New Simon Goldschmidt 3 participants 5 messages Oct 5, 2019 – Oct 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10

These boards don't have a watchdog enabled in SPL, so make sure CONFIG_SPL_WDT is not enabled.

Fixes commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT")

---

While I think the more fundamental problem is selecting SPL_WATCHDOG_SUPPORT in arch/arm/Kconfig, let's fix it this way for the upcoming v2019.10 release to prevent breaking s10.

---
 configs/socfpga_arria10_defconfig      | 1 +
 configs/socfpga_arria5_defconfig       | 1 +
 configs/socfpga_cyclone5_defconfig     | 1 +
 configs/socfpga_dbm_soc1_defconfig     | 1 +
 configs/socfpga_de0_nano_soc_defconfig | 1 +
 configs/socfpga_de10_nano_defconfig    | 1 +
 configs/socfpga_de1_soc_defconfig      | 1 +
 configs/socfpga_is1_defconfig          | 1 +
 configs/socfpga_mcvevk_defconfig       | 1 +
 configs/socfpga_sockit_defconfig       | 1 +
 configs/socfpga_socrates_defconfig     | 1 +
 configs/socfpga_sr1500_defconfig       | 1 +
 configs/socfpga_vining_fpga_defconfig  | 1 +
 13 files changed, 13 insertions(+)
configs/socfpga_arria10_defconfig +1 -0
index a2d555b9b4..7cb214d655 100644
@@ -46,3 +46,4 @@ CONFIG_SPI=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
 CONFIG_DESIGNWARE_APB_TIMER=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_arria5_defconfig +1 -0
index d591c7e4d7..93254677e7 100644
@@ -65,3 +65,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_cyclone5_defconfig +1 -0
index 3f9766d0fb..8e5b2e2f66 100644
@@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_dbm_soc1_defconfig +1 -0
index c6c8f073ea..c73f3821e7 100644
@@ -62,3 +62,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_de0_nano_soc_defconfig +1 -0
index bbd9d7f4b4..80ccb33fbb 100644
@@ -61,3 +61,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_de10_nano_defconfig +1 -0
index a2f58766cc..98e80b7c86 100644
@@ -57,3 +57,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_de1_soc_defconfig +1 -0
index fa2bace56f..efa128ac8e 100644
@@ -47,4 +47,5 @@ CONFIG_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_DWC2=y
+# CONFIG_SPL_WDT is not set
 # CONFIG_EFI_LOADER is not set
configs/socfpga_is1_defconfig +1 -0
index 9e58fd1158..99cdb26aae 100644
@@ -51,3 +51,4 @@ CONFIG_MII=y
 CONFIG_DM_RESET=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_mcvevk_defconfig +1 -0
index 39cc753888..e977cd7707 100644
@@ -58,3 +58,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_sockit_defconfig +1 -0
index a3c6af7810..b570b9dc94 100644
@@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_socrates_defconfig +1 -0
index 1143cd3f37..9eac00e49d 100644
@@ -68,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_sr1500_defconfig +1 -0
index 89349ceb4e..092347a6df 100644
@@ -57,3 +57,4 @@ CONFIG_MII=y
 CONFIG_DM_RESET=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
+# CONFIG_SPL_WDT is not set
configs/socfpga_vining_fpga_defconfig +1 -0
index 6b2266fdfd..c52afddd20 100644
@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10

Quoted 11 lines · Simon Goldschmidt

These boards don't have a watchdog enabled in SPL, so make sure CONFIG_SPL_WDT is not enabled.

Fixes commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT")

---

While I think the more fundamental problem is selecting SPL_WATCHDOG_SUPPORT in arch/arm/Kconfig, let's fix it this way for the upcoming v2019.10 release to prevent breaking s10.

Indeed, we need some sort of bandaid for my flub.

[...]

Quoted 9 lines
configs/socfpga_arria10_defconfig +1 -0
index a2d555b9b4..7cb214d655 100644
@@ -46,3 +46,4 @@ CONFIG_SPI=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
 CONFIG_DESIGNWARE_APB_TIMER=y
+# CONFIG_SPL_WDT is not set

[...]

configs/socfpga_vining_fpga_defconfig CONFIG_USB_GADGET_VENDOR_NUM=0x0525 · line 94

Quoted 9 lines
configs/socfpga_vining_fpga_defconfig +1 -0
index 6b2266fdfd..c52afddd20 100644
@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set

I think these two boards enabled WDT in SPL, no ?

#2 lore raw

PATCH 1/1 arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10

Am 05.10.2019 um 22:12 schrieb Marek Vasut:

Quoted 29 lines · Simon Goldschmidt
Quoted 11 lines

These boards don't have a watchdog enabled in SPL, so make sure CONFIG_SPL_WDT is not enabled.

Fixes commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT")

---

While I think the more fundamental problem is selecting SPL_WATCHDOG_SUPPORT in arch/arm/Kconfig, let's fix it this way for the upcoming v2019.10 release to prevent breaking s10.

Indeed, we need some sort of bandaid for my flub.

[...]

Quoted 9 lines
configs/socfpga_arria10_defconfig +1 -0
index a2d555b9b4..7cb214d655 100644
@@ -46,3 +46,4 @@ CONFIG_SPI=y
  CONFIG_TIMER=y
  CONFIG_SPL_TIMER=y
  CONFIG_DESIGNWARE_APB_TIMER=y
+# CONFIG_SPL_WDT is not set

[...]

Quoted 12 lines

configs/socfpga_vining_fpga_defconfig CONFIG_USB_GADGET_VENDOR_NUM=0x0525 · line 94

Quoted 9 lines
configs/socfpga_vining_fpga_defconfig +1 -0
index 6b2266fdfd..c52afddd20 100644
@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_USB_GADGET_DWC2_OTG=y
  CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set

I think these two boards enabled WDT in SPL, no ?

Hmm, they might. Although I haven't found CONFIG_HW_WATCHDOG enabled with them?

Anyway, that would make my commit message wrong, but the patch would still be correct since none of them uses the DM watchdog framework, or do they?

Do you want me to update the commit message?

Regards,
Simon

#3 lore raw

PATCH 1/1 arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10

Quoted 45 lines · Simon Goldschmidt

Am 05.10.2019 um 22:12 schrieb Marek Vasut:

Quoted 30 lines · Simon Goldschmidt
Quoted 11 lines

These boards don't have a watchdog enabled in SPL, so make sure CONFIG_SPL_WDT is not enabled.

Fixes commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT")

---

While I think the more fundamental problem is selecting SPL_WATCHDOG_SUPPORT in arch/arm/Kconfig, let's fix it this way for the upcoming v2019.10 release to prevent breaking s10.

Indeed, we need some sort of bandaid for my flub.

[...]

Quoted 10 lines
configs/socfpga_arria10_defconfig +0 -0
index a2d555b9b4..7cb214d655 100644
@@ -46,3 +46,4 @@ CONFIG_SPI=y

  CONFIG_TIMER=y
  CONFIG_SPL_TIMER=y
  CONFIG_DESIGNWARE_APB_TIMER=y
+# CONFIG_SPL_WDT is not set

[...]

Quoted 13 lines
Quoted 10 lines
configs/socfpga_vining_fpga_defconfig +0 -0
index 6b2266fdfd..c52afddd20 100644
@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525

  CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_USB_GADGET_DWC2_OTG=y
  CONFIG_USB_GADGET_DOWNLOAD=y
+# CONFIG_SPL_WDT is not set

I think these two boards enabled WDT in SPL, no ?

Quoted 2 lines

Hmm, they might. Although I haven't found CONFIG_HW_WATCHDOG enabled with them?

I must be mistaken then, sorry.

Quoted 3 lines

Anyway, that would make my commit message wrong, but the patch would still be correct since none of them uses the DM watchdog framework, or do they?

I don't think so, since the DW WDT DM conversion didn't happen yet.

Quoted 1 line

Do you want me to update the commit message?

No, I think this should be OK.

#4 lore raw

PATCH 1/1 arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10

In reply to Simon Goldschmidt
Quoted 6 lines · Simon Goldschmidt

These boards don't have a watchdog enabled in SPL, so make sure CONFIG_SPL_WDT is not enabled.

Fixes commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT")

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191006/ad726a6f/attachment.sig>