[LEDE-DEV] kernel: build RTC kmods when RTC_SUPPORT is activated

Message ID 20170708090408.4008-1-hauke@hauke-m.de
State Rejected
Delegated to: Hauke Mehrtens
Headers show

Commit Message

Hauke Mehrtens July 8, 2017, 9:04 a.m.
The build bots are not setting CONFIG_ALL any more, so activate this
module by default why any of the ALL* options is selected.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 package/kernel/linux/modules/other.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Felix Fietkau July 8, 2017, 9:16 a.m. | #1
On 2017-07-08 11:04, Hauke Mehrtens wrote:
> The build bots are not setting CONFIG_ALL any more, so activate this
> module by default why any of the ALL* options is selected.
> 
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
I think it would be more useful for ALL to select ALL_NONSHARED and
ALL_NONSHARED to select ALL_KMODS. This might also make some further
cleanups possible...

- Felix

Patch

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 1b31a861f0..cf710a6c81 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -485,7 +485,7 @@  $(eval $(call KernelPackage,bcma))
 define KernelPackage/rtc-ds1307
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Dallas/Maxim DS1307 (and compatible) RTC support
-  DEFAULT:=m if ALL_KMODS && RTC_SUPPORT
+  DEFAULT:=m if (ALL||ALL_NONSHARED||ALL_KMODS) && RTC_SUPPORT
   DEPENDS:=+kmod-i2c-core
   KCONFIG:=CONFIG_RTC_DRV_DS1307 \
 	CONFIG_RTC_CLASS=y
@@ -504,7 +504,7 @@  $(eval $(call KernelPackage,rtc-ds1307))
 define KernelPackage/rtc-ds1374
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Dallas/Maxim DS1374 RTC support
-  DEFAULT:=m if ALL_KMODS && RTC_SUPPORT
+  DEFAULT:=m if (ALL||ALL_NONSHARED||ALL_KMODS) && RTC_SUPPORT
   DEPENDS:=+kmod-i2c-core
   KCONFIG:=CONFIG_RTC_DRV_DS1374 \
 	CONFIG_RTC_DRV_DS1374_WDT=n \
@@ -523,7 +523,7 @@  $(eval $(call KernelPackage,rtc-ds1374))
 define KernelPackage/rtc-ds1672
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Dallas/Maxim DS1672 RTC support
-  DEFAULT:=m if ALL_KMODS && RTC_SUPPORT
+  DEFAULT:=m if (ALL||ALL_NONSHARED||ALL_KMODS) && RTC_SUPPORT
   DEPENDS:=+kmod-i2c-core
   KCONFIG:=CONFIG_RTC_DRV_DS1672 \
 	CONFIG_RTC_CLASS=y
@@ -541,7 +541,7 @@  $(eval $(call KernelPackage,rtc-ds1672))
 define KernelPackage/rtc-isl1208
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Intersil ISL1208 RTC support
-  DEFAULT:=m if ALL_KMODS && RTC_SUPPORT
+  DEFAULT:=m if (ALL||ALL_NONSHARED||ALL_KMODS) && RTC_SUPPORT
   DEPENDS:=+kmod-i2c-core
   KCONFIG:=CONFIG_RTC_DRV_ISL1208 \
 	CONFIG_RTC_CLASS=y
@@ -559,7 +559,7 @@  $(eval $(call KernelPackage,rtc-isl1208))
 define KernelPackage/rtc-pcf8563
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Philips PCF8563/Epson RTC8564 RTC support
-  DEFAULT:=m if ALL_KMODS && RTC_SUPPORT
+  DEFAULT:=m if (ALL||ALL_NONSHARED||ALL_KMODS) && RTC_SUPPORT
   DEPENDS:=+kmod-i2c-core
   KCONFIG:=CONFIG_RTC_DRV_PCF8563 \
 	CONFIG_RTC_CLASS=y
@@ -578,7 +578,7 @@  $(eval $(call KernelPackage,rtc-pcf8563))
 define KernelPackage/rtc-pcf2123
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Philips PCF2123 RTC support
-  DEFAULT:=m if ALL_KMODS && RTC_SUPPORT
+  DEFAULT:=m if (ALL||ALL_NONSHARED||ALL_KMODS) && RTC_SUPPORT
   KCONFIG:=CONFIG_RTC_DRV_PCF2123 \
 	CONFIG_RTC_CLASS=y
   FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf2123.ko
@@ -594,7 +594,7 @@  $(eval $(call KernelPackage,rtc-pcf2123))
 define KernelPackage/rtc-pt7c4338
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Pericom PT7C4338 RTC support
-  DEFAULT:=m if ALL_KMODS && RTC_SUPPORT
+  DEFAULT:=m if (ALL||ALL_NONSHARED||ALL_KMODS) && RTC_SUPPORT
   DEPENDS:=+kmod-i2c-core
   KCONFIG:=CONFIG_RTC_DRV_PT7C4338 \
 	CONFIG_RTC_CLASS=y
@@ -611,7 +611,7 @@  $(eval $(call KernelPackage,rtc-pt7c4338))
 define KernelPackage/rtc-rs5c372a
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A
-  DEFAULT:=m if ALL_KMODS && RTC_SUPPORT
+  DEFAULT:=m if (ALL||ALL_NONSHARED||ALL_KMODS) && RTC_SUPPORT
   DEPENDS:=+kmod-i2c-core
   KCONFIG:=CONFIG_RTC_DRV_RS5C372 \
 	CONFIG_RTC_CLASS=y