[OpenWrt-Devel] [PATCH] treewide: 5.4: move WATCHDOG_CORE symbol into generic

Petr Štetiar ynezz at true.cz
Tue Mar 17 05:01:39 EDT 2020 

WATCHDOG_CORE config symbol provides driver/framework for all watchdog
timer drivers and gives them the /dev/watchdog interface (and later also
the sysfs interface).

WATCHDOG_CORE config symbol was changed from bool to tristate in v5.2
via upstream commit 0d3e156399ec ("watchdog: Make watchdog core
configurable as module").

At least `kmod-hwmon-sch5627` fails to build due to missing `watchdog.ko`
dependency, so its likely, that this config symbol is needed on all targets,
thus move it into generic config.

Cc: Yousong Zhou <yszhou4tech at gmail.com>
Signed-off-by: Petr Štetiar <ynezz at true.cz>
---

Fixes current build failure[1] of x86/legacy switched to 5.4 recently.

1. http://buildbot.openwrt.org/master/images/builders/x86%2Flegacy/builds/262/steps/pkgbuild/logs/stdio/text

 target/linux/apm821xx/config-5.4        | 1 -
 target/linux/armvirt/config-5.4         | 1 -
 target/linux/ath79/config-5.4           | 1 -
 target/linux/bcm27xx/bcm2708/config-5.4 | 1 -
 target/linux/bcm27xx/bcm2709/config-5.4 | 1 -
 target/linux/bcm27xx/bcm2710/config-5.4 | 1 -
 target/linux/bcm27xx/bcm2711/config-5.4 | 1 -
 target/linux/bcm47xx/config-5.4         | 1 -
 target/linux/bcm53xx/config-5.4         | 1 -
 target/linux/generic/config-5.4         | 2 +-
 target/linux/imx6/config-5.4            | 1 -
 target/linux/ipq40xx/config-5.4         | 1 -
 target/linux/ipq806x/config-5.4         | 1 -
 target/linux/kirkwood/config-5.4        | 1 -
 target/linux/lantiq/config-5.4          | 1 -
 target/linux/malta/config-5.4           | 1 -
 target/linux/mediatek/mt7622/config-5.4 | 1 -
 target/linux/mediatek/mt7623/config-5.4 | 1 -
 target/linux/mediatek/mt7629/config-5.4 | 1 -
 target/linux/mpc85xx/config-5.4         | 1 -
 target/linux/mxs/config-5.4             | 1 -
 target/linux/octeontx/config-5.4        | 1 -
 target/linux/sunxi/config-5.4           | 1 -
 target/linux/tegra/config-5.4           | 1 -
 target/linux/x86/64/config-5.4          | 1 -
 target/linux/x86/generic/config-5.4     | 1 -
 target/linux/zynq/config-5.4            | 1 -
 27 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/target/linux/apm821xx/config-5.4 b/target/linux/apm821xx/config-5.4
index 4c6282156106..ebf766ee6142 100644
--- a/target/linux/apm821xx/config-5.4
+++ b/target/linux/apm821xx/config-5.4
@@ -414,7 +414,6 @@ CONFIG_VDSO32=y
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 # CONFIG_WARP is not set
-CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WNDR4700 is not set
 # CONFIG_XILINX_SDFEC is not set
diff --git a/target/linux/armvirt/config-5.4 b/target/linux/armvirt/config-5.4
index 71ddc3019733..843b3845b2c7 100644
--- a/target/linux/armvirt/config-5.4
+++ b/target/linux/armvirt/config-5.4
@@ -240,5 +240,4 @@ CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
diff --git a/target/linux/ath79/config-5.4 b/target/linux/ath79/config-5.4
index d591f884e703..6f607ee7e409 100644
--- a/target/linux/ath79/config-5.4
+++ b/target/linux/ath79/config-5.4
@@ -244,4 +244,3 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TINY_SRCU=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
-CONFIG_WATCHDOG_CORE=y
diff --git a/target/linux/bcm27xx/bcm2708/config-5.4 b/target/linux/bcm27xx/bcm2708/config-5.4
index 0b25ac389582..7ea25542a352 100644
--- a/target/linux/bcm27xx/bcm2708/config-5.4
+++ b/target/linux/bcm27xx/bcm2708/config-5.4
@@ -405,7 +405,6 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0x0
diff --git a/target/linux/bcm27xx/bcm2709/config-5.4 b/target/linux/bcm27xx/bcm2709/config-5.4
index 6ff73a748d67..6e8fb2d2f3dd 100644
--- a/target/linux/bcm27xx/bcm2709/config-5.4
+++ b/target/linux/bcm27xx/bcm2709/config-5.4
@@ -527,7 +527,6 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 b/target/linux/bcm27xx/bcm2710/config-5.4
index d21c62afd036..2ec3ead1cbda 100644
--- a/target/linux/bcm27xx/bcm2710/config-5.4
+++ b/target/linux/bcm27xx/bcm2710/config-5.4
@@ -601,7 +601,6 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4
index 71b6723ac457..b956ad16d7a3 100644
--- a/target/linux/bcm27xx/bcm2711/config-5.4
+++ b/target/linux/bcm27xx/bcm2711/config-5.4
@@ -612,7 +612,6 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
diff --git a/target/linux/bcm47xx/config-5.4 b/target/linux/bcm47xx/config-5.4
index 8f679b377fba..608c39122c19 100644
--- a/target/linux/bcm47xx/config-5.4
+++ b/target/linux/bcm47xx/config-5.4
@@ -206,4 +206,3 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TINY_SRCU=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_GENERIC_EARLY_PRINTK_8250=y
-CONFIG_WATCHDOG_CORE=y
diff --git a/target/linux/bcm53xx/config-5.4 b/target/linux/bcm53xx/config-5.4
index 676015f20037..a221efc65028 100644
--- a/target/linux/bcm53xx/config-5.4
+++ b/target/linux/bcm53xx/config-5.4
@@ -450,7 +450,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 # CONFIG_VALIDATE_FS_PARSER is not set
 # CONFIG_VFP is not set
-CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_XILINX_SDFEC is not set
 CONFIG_XPS=y
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 2f84939c0ce7..aa5ec95dd671 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -6362,7 +6362,7 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_WANXL is not set
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_CORE is not set
+CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_OPEN_TIMEOUT=0
diff --git a/target/linux/imx6/config-5.4 b/target/linux/imx6/config-5.4
index bd7d95bd9ca1..b56956547032 100644
--- a/target/linux/imx6/config-5.4
+++ b/target/linux/imx6/config-5.4
@@ -704,7 +704,6 @@ CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_VMSPLIT_2G=y
 # CONFIG_VMSPLIT_3G is not set
-CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_XILINX_SDFEC is not set
 CONFIG_XPS=y
diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4
index 86fabe601004..55b1b5a5b8f8 100644
--- a/target/linux/ipq40xx/config-5.4
+++ b/target/linux/ipq40xx/config-5.4
@@ -540,7 +540,6 @@ CONFIG_USE_OF=y
 CONFIG_VDSO=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
 CONFIG_XZ_DEC_ARM=y
diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4
index c9c50c91bc4a..c7bdb3a6d3e5 100644
--- a/target/linux/ipq806x/config-5.4
+++ b/target/linux/ipq806x/config-5.4
@@ -522,7 +522,6 @@ CONFIG_USE_OF=y
 CONFIG_VDSO=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
 CONFIG_XZ_DEC_ARM=y
diff --git a/target/linux/kirkwood/config-5.4 b/target/linux/kirkwood/config-5.4
index e149631f0ea1..93208097b0bc 100644
--- a/target/linux/kirkwood/config-5.4
+++ b/target/linux/kirkwood/config-5.4
@@ -350,7 +350,6 @@ CONFIG_USE_OF=y
 # CONFIG_VFP is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0x0
diff --git a/target/linux/lantiq/config-5.4 b/target/linux/lantiq/config-5.4
index 501bd77fbdf3..943b266612f7 100644
--- a/target/linux/lantiq/config-5.4
+++ b/target/linux/lantiq/config-5.4
@@ -231,5 +231,4 @@ CONFIG_TARGET_ISA_REV=2
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TINY_SRCU=y
 CONFIG_USE_OF=y
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_XRX200_PHY_FW is not set
diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4
index 37d3dbef9ae0..41fc9770435f 100644
--- a/target/linux/malta/config-5.4
+++ b/target/linux/malta/config-5.4
@@ -341,5 +341,4 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VXFS_FS=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
diff --git a/target/linux/mediatek/mt7622/config-5.4 b/target/linux/mediatek/mt7622/config-5.4
index f867844885bb..1d20ca2d92e8 100755
--- a/target/linux/mediatek/mt7622/config-5.4
+++ b/target/linux/mediatek/mt7622/config-5.4
@@ -590,7 +590,6 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_MTK=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_VMAP_STACK=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
 CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP is not set
diff --git a/target/linux/mediatek/mt7623/config-5.4 b/target/linux/mediatek/mt7623/config-5.4
index 6e1ff28bd30b..998f54efb5eb 100644
--- a/target/linux/mediatek/mt7623/config-5.4
+++ b/target/linux/mediatek/mt7623/config-5.4
@@ -548,7 +548,6 @@ CONFIG_USE_OF=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
 CONFIG_XZ_DEC_ARM=y
diff --git a/target/linux/mediatek/mt7629/config-5.4 b/target/linux/mediatek/mt7629/config-5.4
index 5ca8444c361e..c1888e14c755 100644
--- a/target/linux/mediatek/mt7629/config-5.4
+++ b/target/linux/mediatek/mt7629/config-5.4
@@ -465,7 +465,6 @@ CONFIG_USB_XHCI_MTK=y
 CONFIG_USE_OF=y
 # CONFIG_VALIDATE_FS_PARSER is not set
 # CONFIG_VFP is not set
-CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 # CONFIG_XILINX_SDFEC is not set
diff --git a/target/linux/mpc85xx/config-5.4 b/target/linux/mpc85xx/config-5.4
index 65ee414c4e25..8a95787632b6 100644
--- a/target/linux/mpc85xx/config-5.4
+++ b/target/linux/mpc85xx/config-5.4
@@ -322,7 +322,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VDSO32=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_WS_AP3710I is not set
 # CONFIG_XES_MPC85xx is not set
 # CONFIG_XPS_USB_HCD_XILINX is not set
diff --git a/target/linux/mxs/config-5.4 b/target/linux/mxs/config-5.4
index 7232234b9762..9166b39edf1c 100644
--- a/target/linux/mxs/config-5.4
+++ b/target/linux/mxs/config-5.4
@@ -295,7 +295,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USB_ULPI_BUS=y
 CONFIG_USE_OF=y
 # CONFIG_VFP is not set
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0
diff --git a/target/linux/octeontx/config-5.4 b/target/linux/octeontx/config-5.4
index a75bf78d357a..aee7ef88b789 100644
--- a/target/linux/octeontx/config-5.4
+++ b/target/linux/octeontx/config-5.4
@@ -620,7 +620,6 @@ CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VMAP_STACK=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
diff --git a/target/linux/sunxi/config-5.4 b/target/linux/sunxi/config-5.4
index 1e54e980a36d..40ad92df8918 100644
--- a/target/linux/sunxi/config-5.4
+++ b/target/linux/sunxi/config-5.4
@@ -580,7 +580,6 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
 CONFIG_XZ_DEC_ARM=y
diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index 5313e39894ed..c52b0e88b65f 100644
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -563,7 +563,6 @@ CONFIG_VDSO=y
 # CONFIG_VFIO is not set
 CONFIG_VFP=y
 CONFIG_VFPv3=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4
index ceee923b0f50..1eb59c1965e6 100644
--- a/target/linux/x86/64/config-5.4
+++ b/target/linux/x86/64/config-5.4
@@ -447,7 +447,6 @@ CONFIG_VMWARE_VMCI_VSOCKETS=y
 CONFIG_VMXNET3=y
 CONFIG_VSOCKETS=y
 CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_X86_5LEVEL is not set
 CONFIG_X86_64=y
 CONFIG_X86_64_SMP=y
diff --git a/target/linux/x86/generic/config-5.4 b/target/linux/x86/generic/config-5.4
index 4a689ca026c7..4d308bfa0ef1 100644
--- a/target/linux/x86/generic/config-5.4
+++ b/target/linux/x86/generic/config-5.4
@@ -401,7 +401,6 @@ CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_WDT is not set
 CONFIG_X86_32_SMP=y
 CONFIG_X86_ACPI_CPUFREQ=y
diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4
index f201f526b486..0c16b70c0521 100644
--- a/target/linux/zynq/config-5.4
+++ b/target/linux/zynq/config-5.4
@@ -642,7 +642,6 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_WEXT_PRIV is not set
 # CONFIG_WEXT_SPY is not set
 # CONFIG_WIRELESS_EXT is not set

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

More information about the openwrt-devel mailing list