提交 e263607a 编写于 作者: S Simon Goldschmidt 提交者: Tom Rini

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 6874cb72 ("watchdog: Split WDT from SPL_WDT")
Signed-off-by: NSimon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
上级 a11cb57d
...@@ -46,3 +46,4 @@ CONFIG_SPI=y ...@@ -46,3 +46,4 @@ CONFIG_SPI=y
CONFIG_TIMER=y CONFIG_TIMER=y
CONFIG_SPL_TIMER=y CONFIG_SPL_TIMER=y
CONFIG_DESIGNWARE_APB_TIMER=y CONFIG_DESIGNWARE_APB_TIMER=y
# CONFIG_SPL_WDT is not set
...@@ -65,3 +65,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -65,3 +65,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
...@@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
...@@ -62,3 +62,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -62,3 +62,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
...@@ -61,3 +61,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -61,3 +61,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
...@@ -57,3 +57,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -57,3 +57,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
...@@ -47,4 +47,5 @@ CONFIG_SPI=y ...@@ -47,4 +47,5 @@ CONFIG_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_USB_DWC2=y CONFIG_USB_DWC2=y
# CONFIG_SPL_WDT is not set
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set
...@@ -51,3 +51,4 @@ CONFIG_MII=y ...@@ -51,3 +51,4 @@ CONFIG_MII=y
CONFIG_DM_RESET=y CONFIG_DM_RESET=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_CADENCE_QSPI=y CONFIG_CADENCE_QSPI=y
# CONFIG_SPL_WDT is not set
...@@ -58,3 +58,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -58,3 +58,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
...@@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
...@@ -68,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -68,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
...@@ -57,3 +57,4 @@ CONFIG_MII=y ...@@ -57,3 +57,4 @@ CONFIG_MII=y
CONFIG_DM_RESET=y CONFIG_DM_RESET=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_CADENCE_QSPI=y CONFIG_CADENCE_QSPI=y
# CONFIG_SPL_WDT is not set
...@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册