[Astlinux-commits] SF.net SVN: astlinux:[8321] branches/1.0

[<abe...@us...>]

Revision: 8321
          http://sourceforge.net/p/astlinux/code/8321
Author:   abelbeck
Date:     2017-05-22 13:34:09 +0000 (Mon, 22 May 2017)
Log Message:
-----------
Fix RTC for new kernel, CONFIG_RTC_DRV_CMOS=y builds rtc-cmos into the kernel.  Ignore 'rtc' in rc.modules

Modified Paths:
--------------
    branches/1.0/package/chrony/ntpd.init
    branches/1.0/package/ntp/ntpd.init
    branches/1.0/project/astlinux/board/alix/target_skeleton/etc/rc.modules
    branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/rc.modules
    branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/rc.modules
    branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules
    branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules
    branches/1.0/project/astlinux/board/genx86_64-vm/target_skeleton/etc/rc.modules
    branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/rc.modules
    branches/1.0/project/astlinux/genx86_64/linux-smp.config
    branches/1.0/project/astlinux/target_skeleton/etc/rc

Modified: branches/1.0/package/chrony/ntpd.init
===================================================================
--- branches/1.0/package/chrony/ntpd.init	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/package/chrony/ntpd.init	2017-05-22 13:34:09 UTC (rev 8321)
@@ -75,8 +75,8 @@
     if [ -n "$first" ]; then
       echo "Setting local system time using '$first'..."
       if chronyd -q -t 8 "server $first iburst"; then
-        if [ -r /dev/rtc ]; then
-          hwclock -wu --noadjfile 2>/dev/null
+        if [ -r /dev/rtc0 ]; then
+          hwclock -wu --noadjfile --rtc /dev/rtc0 2>/dev/null
         fi
       else
         logger -s -t chronyd -p kern.info "Failed to set time using NTP server '$first', continuing in the background."

Modified: branches/1.0/package/ntp/ntpd.init
===================================================================
--- branches/1.0/package/ntp/ntpd.init	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/package/ntp/ntpd.init	2017-05-22 13:34:09 UTC (rev 8321)
@@ -72,8 +72,8 @@
 
       # Set the clock (large change)
       if sntp $NTPAF -S -t4 $first; then
-        if [ -r /dev/rtc ]; then
-          hwclock -wu --noadjfile 2>/dev/null
+        if [ -r /dev/rtc0 ]; then
+          hwclock -wu --noadjfile --rtc /dev/rtc0 2>/dev/null
         fi
         sleep 1
 

Modified: branches/1.0/project/astlinux/board/alix/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/alix/target_skeleton/etc/rc.modules	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/board/alix/target_skeleton/etc/rc.modules	2017-05-22 13:34:09 UTC (rev 8321)
@@ -1,5 +1,5 @@
 ## These modules get modprobe'd when the system starts up.
-rtc
+##
 ## Uncomment any additional modules you need.
 ##
 ## Ethernet support

Modified: branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/rc.modules	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/rc.modules	2017-05-22 13:34:09 UTC (rev 8321)
@@ -1,5 +1,5 @@
 ## These modules get modprobe'd when the system starts up.
-rtc
+##
 ## Comment out any modules you don't need.
 ##
 ## Ethernet support

Modified: branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/rc.modules	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/rc.modules	2017-05-22 13:34:09 UTC (rev 8321)
@@ -1,5 +1,5 @@
 ## These modules get modprobe'd when the system starts up.
-rtc
+##
 ## Comment out any modules you don't need.
 ##
 ## Ethernet support

Modified: branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules	2017-05-22 13:34:09 UTC (rev 8321)
@@ -1,5 +1,5 @@
 ## These modules get modprobe'd when the system starts up.
-rtc
+##
 ## Comment out any modules you don't need.
 ##
 ## Ethernet support

Modified: branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules	2017-05-22 13:34:09 UTC (rev 8321)
@@ -1,5 +1,5 @@
 ## These modules get modprobe'd when the system starts up.
-rtc
+##
 ## Comment out any modules you don't need.
 ##
 ## Ethernet support

Modified: branches/1.0/project/astlinux/board/genx86_64-vm/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-vm/target_skeleton/etc/rc.modules	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/board/genx86_64-vm/target_skeleton/etc/rc.modules	2017-05-22 13:34:09 UTC (rev 8321)
@@ -1,5 +1,5 @@
 ## These modules get modprobe'd when the system starts up.
-rtc
+##
 ## Comment out any modules you don't need.
 ##
 ## Ethernet support

Modified: branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/rc.modules	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/rc.modules	2017-05-22 13:34:09 UTC (rev 8321)
@@ -1,5 +1,5 @@
 ## These modules get modprobe'd when the system starts up.
-rtc
+##
 ## Uncomment any additional modules you need.
 ##
 ## Ethernet support

Modified: branches/1.0/project/astlinux/genx86_64/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp.config	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp.config	2017-05-22 13:34:09 UTC (rev 8321)
@@ -309,6 +309,7 @@
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
@@ -2644,7 +2645,79 @@
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=y
+# CONFIG_RTC_HCTOSYS is not set
+CONFIG_RTC_SYSTOHC=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 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12057 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_MOXART is not set
+# CONFIG_RTC_DRV_XGENE is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set

Modified: branches/1.0/project/astlinux/target_skeleton/etc/rc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/rc	2017-05-22 02:31:28 UTC (rev 8320)
+++ branches/1.0/project/astlinux/target_skeleton/etc/rc	2017-05-22 13:34:09 UTC (rev 8321)
@@ -228,7 +228,7 @@
     (while read i; do
      if [ "$i" = "sleep" ]; then
        sleep 2
-     else
+     elif [ "$i" != "rtc" ]; then
        modprobe $i 2>/dev/null
      fi
      done)
@@ -235,10 +235,9 @@
     sleep 5
   fi
 
-  #set the clock to zulu time -- but only after modules (including rtc)
-  #have been loaded above.
-  if [ -r /dev/rtc ]; then
-    hwclock -su 2>/dev/null
+  #set the clock to zulu time, assuming rtc-cmos built-in to kernel
+  if [ -r /dev/rtc0 ]; then
+    hwclock -su --rtc /dev/rtc0 2>/dev/null
   fi
 
   #Apply IO schedulers
@@ -414,8 +413,8 @@
   sync
   sleep 2
 
-  if [ -r /dev/rtc ]; then
-    hwclock -wu 2>/dev/null
+  if [ -r /dev/rtc0 ]; then
+    hwclock -wu --rtc /dev/rtc0 2>/dev/null
   fi
 
   umount -a -r 2>/dev/null

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.