From patchwork Fri Aug 10 21:51:48 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: UBUNTU: config: Make rtc-pl031 static on highbank
Date: Fri, 10 Aug 2012 11:51:48 -0000
From: dann frazier <dann.frazier@canonical.com>
X-Patchwork-Id: 176957
Message-Id: <20120810215148.GA1265@dannf.org>
To: kernel-team@lists.ubuntu.com

rtc-pl031 is the driver used for the RTC on the highbank
platform. We build it as a module in precise/quantal, but that makes
it unavailable in early boot, which results in this error message:

/build/buildd/linux-3.2.0/drivers/rtc/hctosys.c: unable to open rtc device (rtc0)

And also prevents us from being able to accurately check the
last-mounted time on the root filesystem.

BugLink: https://bugs.launchpad.net/eilt/+bug/1035110

Signed-off-by: dann frazier <dann.frazier@canonical.com>


diff -urpN linux-3.5.0.orig/debian.master/config/armel/config.common.armel linux-3.5.0/debian.master/config/armel/config.common.armel
--- linux-3.5.0.orig/debian.master/config/armel/config.common.armel	2012-08-10 16:28:30.000000000 -0500
+++ linux-3.5.0/debian.master/config/armel/config.common.armel	2012-08-10 16:32:55.629993528 -0500
@@ -199,6 +199,7 @@ CONFIG_RELAY=y
 # CONFIG_RT2800USB_UNKNOWN is not set
 CONFIG_RT2X00_LIB_DEBUGFS=y
 CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SATA_AHCI_PLATFORM=m
diff -urpN linux-3.5.0.orig/debian.master/config/armhf/config.flavour.highbank linux-3.5.0/debian.master/config/armhf/config.flavour.highbank
--- linux-3.5.0.orig/debian.master/config/armhf/config.flavour.highbank	2012-08-10 16:28:30.000000000 -0500
+++ linux-3.5.0/debian.master/config/armhf/config.flavour.highbank	2012-08-10 16:32:07.199993532 -0500
@@ -135,6 +135,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_REISERFS_FS_POSIX_ACL is not set
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_RELAY is not set
+CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SCHED_AUTOGROUP is not set
diff -urpN linux-3.5.0.orig/debian.master/config/armhf/config.flavour.omap linux-3.5.0/debian.master/config/armhf/config.flavour.omap
--- linux-3.5.0.orig/debian.master/config/armhf/config.flavour.omap	2012-08-10 16:28:30.000000000 -0500
+++ linux-3.5.0/debian.master/config/armhf/config.flavour.omap	2012-08-10 16:32:07.229993532 -0500
@@ -135,6 +135,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
+CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SCHED_AUTOGROUP=y
diff -urpN linux-3.5.0.orig/debian.master/config/config.common.ubuntu linux-3.5.0/debian.master/config/config.common.ubuntu
--- linux-3.5.0.orig/debian.master/config/config.common.ubuntu	2012-08-10 16:28:30.000000000 -0500
+++ linux-3.5.0/debian.master/config/config.common.ubuntu	2012-08-10 16:32:55.609993528 -0500
@@ -4536,7 +4536,6 @@ CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_PS3=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m