From db40add2386b71e58da337839989e7f3a1f05a26 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sun, 3 Jan 2021 22:40:01 +0900 Subject: [PATCH] kernel: update kmod-thermal package CONFIG_THERMAL option was changed to boolean in upstream linux commit 554b3529fe01 ("thermal/drivers/core: Remove the module Kconfig's option"). Switch it to 'y' and remove FILES and AUTOLOAD for non-existant module file. And update the descripton text for the package as in upstream linux commit eb8504620381 ("thermal: Rephrase the Kconfig text for thermal"). Signed-off-by: Sungbo Eo --- package/kernel/linux/modules/other.mk | 11 ++++------- ...tristate.patch => 999-make-phylink-tristate.patch} | 0 .../generic/hack-5.4/999-make-thermal-tristate.patch | 11 ----------- .../linux/ramips/patches-5.4/998-thermal-bool.patch | 11 ----------- 4 files changed, 4 insertions(+), 29 deletions(-) rename target/linux/generic/hack-5.4/{998-make-phylink-tristate.patch => 999-make-phylink-tristate.patch} (100%) delete mode 100644 target/linux/generic/hack-5.4/999-make-thermal-tristate.patch delete mode 100644 target/linux/ramips/patches-5.4/998-thermal-bool.patch diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 421b1b536c..83d998c83a 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -1039,11 +1039,11 @@ $(eval $(call KernelPackage,random-core)) define KernelPackage/thermal SUBMENU:=$(OTHER_MENU) - TITLE:=Generic Thermal sysfs driver + TITLE:=Thermal driver DEPENDS:=+kmod-hwmon-core HIDDEN:=1 KCONFIG:= \ - CONFIG_THERMAL \ + CONFIG_THERMAL=y \ CONFIG_THERMAL_OF=y \ CONFIG_CPU_THERMAL=y \ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y \ @@ -1055,14 +1055,11 @@ define KernelPackage/thermal CONFIG_THERMAL_GOV_USER_SPACE=n \ CONFIG_THERMAL_HWMON=y \ CONFIG_THERMAL_EMULATION=n - FILES:=$(LINUX_DIR)/drivers/thermal/thermal_sys.ko - AUTOLOAD:=$(call AutoProbe,thermal_sys) endef define KernelPackage/thermal/description - Generic Thermal Sysfs driver offers a generic mechanism for thermal - management. Usually it's made up of one or more thermal zone and cooling - device. + Thermal driver offers a generic mechanism for thermal management. + Usually it's made up of one or more thermal zone and cooling device. endef $(eval $(call KernelPackage,thermal)) diff --git a/target/linux/generic/hack-5.4/998-make-phylink-tristate.patch b/target/linux/generic/hack-5.4/999-make-phylink-tristate.patch similarity index 100% rename from target/linux/generic/hack-5.4/998-make-phylink-tristate.patch rename to target/linux/generic/hack-5.4/999-make-phylink-tristate.patch diff --git a/target/linux/generic/hack-5.4/999-make-thermal-tristate.patch b/target/linux/generic/hack-5.4/999-make-thermal-tristate.patch deleted file mode 100644 index 8a207c8eae..0000000000 --- a/target/linux/generic/hack-5.4/999-make-thermal-tristate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/thermal/Kconfig -+++ b/drivers/thermal/Kconfig -@@ -4,7 +4,7 @@ - # - - menuconfig THERMAL -- bool "Generic Thermal sysfs driver" -+ tristate "Generic Thermal sysfs driver" - help - Generic Thermal Sysfs driver offers a generic mechanism for - thermal management. Usually it's made up of one or more thermal diff --git a/target/linux/ramips/patches-5.4/998-thermal-bool.patch b/target/linux/ramips/patches-5.4/998-thermal-bool.patch deleted file mode 100644 index ba05101d78..0000000000 --- a/target/linux/ramips/patches-5.4/998-thermal-bool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/thermal/Kconfig -+++ b/drivers/thermal/Kconfig -@@ -4,7 +4,7 @@ - # - - menuconfig THERMAL -- tristate "Generic Thermal sysfs driver" -+ bool "Generic Thermal sysfs driver" - help - Generic Thermal Sysfs driver offers a generic mechanism for - thermal management. Usually it's made up of one or more thermal