kernel: build rtc-cmos into i586 kernel.

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 97cc1194e4dd88373892251505e3ee8dff7f2713..4482c9bd180ad69b9b9f3a232527e3427b7bbf31 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3929,7 +3929,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 #
 # Platform RTC drivers
 #
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index e50ea0b2fd94df70c96207a19e572fd1c60738fb..2298c53288c9fdd0bcc9b09b0188f4d9fae8d7b0 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -2452,9 +2452,6 @@ CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
-CONFIG_RTC=m
-CONFIG_GEN_RTC=m
-CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -3459,8 +3456,6 @@ CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_SEQUENCER_OSS=y
 # CONFIG_SND_HRTIMER is not set
-CONFIG_SND_RTCTIMER=m
-CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
 CONFIG_SND_VERBOSE_PROCFS=y
@@ -3955,7 +3950,70 @@ CONFIG_LEDS_TRIGGER_NETDEV=m
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 

diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 0f5498a2925c7728b76ac04c9aee46b511532c6a..03ecc6337bcf9e1846e868f2e13c988eda84e525 100644 (file)
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -1378,7 +1378,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/rtc
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq32k.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq4802.ko
-#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-cmos.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1286.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1307.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1374.ko

diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index 7bb598d42acfacbf4a8ec79c401dc76ea8d21ec1..a75c461d9ef162ef1800c14d27148fed0270f124 100644 (file)
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -244,7 +244,6 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/sis-agp.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/sworks-agp.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/via-agp.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/char/genrtc.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/hangcheck-timer.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/amd-rng.ko
@@ -270,7 +269,6 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia/synclink_cs.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/ppdev.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/char/rtc.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/scx200_gpio.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/char/toshiba.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource
@@ -1393,6 +1391,39 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/drivers/regulator
 #lib/modules/KVER-ipfire-pae/kernel/drivers/regulator/fixed.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/regulator/gpio-regulator.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-bq32k.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-bq4802.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1286.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1307.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1374.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1511.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1553.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1672.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1742.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds3232.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-em3027.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-fm3130.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-isl12022.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-isl1208.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m41t80.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t35.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t59.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t86.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-max6900.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-msm6242.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf50633.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf8563.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf8583.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rp5c01.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rs5c372.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rv3029c2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rx8025.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rx8581.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-s35390a.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-stk17ta8.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-v3020.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-x1205.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/scsi
 #lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/3w-9xxx.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/3w-sas.ko
@@ -2238,7 +2269,6 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-page-alloc.ko
 #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-pcm.ko
 #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-rawmidi.ko
-#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-rtctimer.ko
 #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-timer.ko
 #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd.ko
 #lib/modules/KVER-ipfire-pae/kernel/sound/drivers