kernel: set WATCHDOG_CORE dependency in kmod-hwmon-sch5627

For many target we have added CONFIG_WATCHDOG_CORE=y to the target
config due to the following error:

 Package kmod-hwmon-sch5627 is missing dependencies for the following
 libraries:
 watchdog.ko

However, actually the proper way appears to be setting the
dependency for the kmod-hwmon-sch5627 package, as the error message
demands.

Do this in this patch and remove the target config entries added
due to this issue.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index 0b9e9d8b132566890e0f910d18b96d28ddcec3e9..a39a8910f0a07c364521c7aebae39770eea940e8 100644 (file)
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -409,7 +409,9 @@ $(eval $(call KernelPackage,hwmon-pwmfan))
 
 define KernelPackage/hwmon-sch5627
   TITLE:=SMSC SCH5627 monitoring support
-  KCONFIG:=CONFIG_SENSORS_SCH5627
+  KCONFIG:= \
+       CONFIG_SENSORS_SCH5627 \
+       CONFIG_WATCHDOG_CORE=y
   FILES:= \
        $(LINUX_DIR)/drivers/hwmon/sch5627.ko \
        $(LINUX_DIR)/drivers/hwmon/sch56xx-common.ko

diff --git a/target/linux/arc770/config-5.4 b/target/linux/arc770/config-5.4
index fcbad961fd49096ab7e70e4423d7078b643301c4..ce712b4c34e849e1aedaa9df724b93ca0b85acd3 100644 (file)
--- a/target/linux/arc770/config-5.4
+++ b/target/linux/arc770/config-5.4
@@ -196,4 +196,3 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_SRCU=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_USB_SUPPORT=y
-CONFIG_WATCHDOG_CORE=y

diff --git a/target/linux/armvirt/config-5.4 b/target/linux/armvirt/config-5.4
index 0754831fe4b0d1f8d392f6f80deaef5ae2dc036d..4842825a1e690e9a9497f3a03225fc45777e018a 100644 (file)
--- a/target/linux/armvirt/config-5.4
+++ b/target/linux/armvirt/config-5.4
@@ -237,5 +237,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 6ef32cfefa855cd72b9327e1bfdad5ad96aad9db..0f5352a9210fa683ff3109cffa1e190d3d09d75c 100644 (file)
--- a/target/linux/ath79/config-5.4
+++ b/target/linux/ath79/config-5.4
@@ -245,4 +245,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/bcm63xx/config-5.4 b/target/linux/bcm63xx/config-5.4
index 6c2cbb4cc3a5829181579831a582dfe93cf13314..dd4d67224c23ce8889d94d9e9e5a706c5ffb06a5 100644 (file)
--- a/target/linux/bcm63xx/config-5.4
+++ b/target/linux/bcm63xx/config-5.4
@@ -277,6 +277,5 @@ CONFIG_TINY_SRCU=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_WEAK_ORDERING=y

diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4
index 2b678cead6a76eb644db7d031aebcd9d0c361b93..29566ee1715b1cfc002532588cff1321931f7fc6 100644 (file)
--- a/target/linux/malta/config-5.4
+++ b/target/linux/malta/config-5.4
@@ -340,5 +340,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/x86/geode/config-4.19 b/target/linux/x86/geode/config-4.19
index 316111aa0e33c4ab6a206bf7fb7ca462350fa72d..651c369178131458a35e334777b6bb88e0b0db7c 100644 (file)
--- a/target/linux/x86/geode/config-4.19
+++ b/target/linux/x86/geode/config-4.19
@@ -121,7 +121,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_VIA_RHINE=y
 CONFIG_VIA_RHINE_MMIO=y
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_WDT is not set
 # CONFIG_X86_ACPI_CPUFREQ is not set
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set

diff --git a/target/linux/x86/geode/config-5.4 b/target/linux/x86/geode/config-5.4
index 316111aa0e33c4ab6a206bf7fb7ca462350fa72d..651c369178131458a35e334777b6bb88e0b0db7c 100644 (file)
--- a/target/linux/x86/geode/config-5.4
+++ b/target/linux/x86/geode/config-5.4
@@ -121,7 +121,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_VIA_RHINE=y
 CONFIG_VIA_RHINE_MMIO=y
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_WDT is not set
 # CONFIG_X86_ACPI_CPUFREQ is not set
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set

diff --git a/target/linux/x86/legacy/config-4.19 b/target/linux/x86/legacy/config-4.19
index c1cd35311494f2b88e04686b682d146aca587e34..2e5199185af252578854d360dd6435837430e03f 100644 (file)
--- a/target/linux/x86/legacy/config-4.19
+++ b/target/linux/x86/legacy/config-4.19
@@ -206,7 +206,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_WDT is not set
 CONFIG_X86_ACPI_CPUFREQ=y
 # CONFIG_X86_ACPI_CPUFREQ_CPB is not set

diff --git a/target/linux/x86/legacy/config-5.4 b/target/linux/x86/legacy/config-5.4
index c1cd35311494f2b88e04686b682d146aca587e34..2e5199185af252578854d360dd6435837430e03f 100644 (file)
--- a/target/linux/x86/legacy/config-5.4
+++ b/target/linux/x86/legacy/config-5.4
@@ -206,7 +206,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_WATCHDOG_CORE=y
 # CONFIG_WDT is not set
 CONFIG_X86_ACPI_CPUFREQ=y
 # CONFIG_X86_ACPI_CPUFREQ_CPB is not set