[PATCH Vivid SRU] UBUNTU: [Config] CONFIG_RTC_DRV_XGENE=y for only arm64

tim.gardner at canonical.com tim.gardner at canonical.com
Tue Sep 29 21:27:47 UTC 2015 

From: Tim Gardner <tim.gardner at canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1499869

This driver only works on arm64 platforms.

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/abi/3.19.0-30.33/arm64/generic.modules          | 1 -
 debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules     | 1 -
 debian.master/abi/3.19.0-30.33/armhf/generic.modules          | 1 -
 debian.master/abi/3.19.0-30.33/i386/generic.modules           | 1 -
 debian.master/abi/3.19.0-30.33/i386/lowlatency.modules        | 1 -
 debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules | 1 -
 debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules    | 1 -
 debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules  | 1 -
 debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules  | 1 -
 debian.master/abi/3.19.0-30.33/ppc64el/generic.modules        | 1 -
 debian.master/config/amd64/config.common.amd64                | 2 +-
 debian.master/config/annotations                              | 2 +-
 debian.master/config/arm64/config.common.arm64                | 2 +-
 debian.master/config/armhf/config.common.armhf                | 2 +-
 debian.master/config/i386/config.common.i386                  | 2 +-
 debian.master/config/powerpc/config.common.powerpc            | 2 +-
 debian.master/config/ppc64el/config.common.ppc64el            | 2 +-
 17 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/debian.master/abi/3.19.0-30.33/arm64/generic.modules b/debian.master/abi/3.19.0-30.33/arm64/generic.modules
index 4fd6e78..d71fc0a 100644
--- a/debian.master/abi/3.19.0-30.33/arm64/generic.modules
+++ b/debian.master/abi/3.19.0-30.33/arm64/generic.modules
@@ -2796,7 +2796,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules b/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules
index 51868ae..4b5ce23 100644
--- a/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules
+++ b/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules
@@ -2933,7 +2933,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/armhf/generic.modules b/debian.master/abi/3.19.0-30.33/armhf/generic.modules
index 709201b..2a24096 100644
--- a/debian.master/abi/3.19.0-30.33/armhf/generic.modules
+++ b/debian.master/abi/3.19.0-30.33/armhf/generic.modules
@@ -2979,7 +2979,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/i386/generic.modules b/debian.master/abi/3.19.0-30.33/i386/generic.modules
index feeb2c8..79d1f80 100644
--- a/debian.master/abi/3.19.0-30.33/i386/generic.modules
+++ b/debian.master/abi/3.19.0-30.33/i386/generic.modules
@@ -3136,7 +3136,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules b/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules
index 1a9d4ad..39bb8f3 100644
--- a/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules
+++ b/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules
@@ -3135,7 +3135,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules
index c500f7a..e07119b 100644
--- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules
+++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules
@@ -2902,7 +2902,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules
index 1a07285..8e250a0 100644
--- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules
+++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules
@@ -2878,7 +2878,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules
index 01acc65..a3ceab9 100644
--- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules
+++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules
@@ -2875,7 +2875,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules
index e5883e3..8ef0b0f 100644
--- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules
+++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules
@@ -2887,7 +2887,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules b/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules
index f2edc5c..a7de774 100644
--- a/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules
+++ b/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules
@@ -2820,7 +2820,6 @@ rtc-v3020
 rtc-wm831x
 rtc-wm8350
 rtc-x1205
-rtc-xgene
 rtd520
 rti800
 rti802
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 48ae1a2..53b41ca 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -101,7 +101,7 @@ CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTC_DRV_XGENE=y
+# CONFIG_RTC_DRV_XGENE is not set
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_SVW=m
 CONFIG_SCHED_SMT=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 52624b2..9f32a64 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1822,7 +1822,7 @@ CONFIG_RTC_DRV_TWL4030				p policy<{'armhf': 'y', '*': 'm'}> note<boot essential
 CONFIG_RTC_DRV_OMAP				p policy<{'armhf': 'y', '*': 'm'}>
 CONFIG_RTC_DRV_S3C				p policy<{'armhf': 'y', '*': 'm'}>
 CONFIG_RTC_DRV_PL031				p policy<{'armhf': 'y', '*': 'm'}>
-CONFIG_RTC_DRV_XGENE				p policy<{'amd64': 'y', '*': 'm'}>
+CONFIG_RTC_DRV_XGENE				p policy<{'arm64': 'y', '*': 'n'}>
 CONFIG_RTC_DRV_DS1374_WDT			y
 CONFIG_RTC_DRV_PCF8523				p policy<{'armhf-generic': 'y', '*': 'm'}>
 CONFIG_RTC_DRV_OPAL				p policy<{'powerpc-powerpc64-smp': 'y', 'ppc64el-generic': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 248a1bb..6ef09c1 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -93,7 +93,7 @@ CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTC_DRV_XGENE=m
+CONFIG_RTC_DRV_XGENE=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_SVW=m
 CONFIG_SCHED_SMT=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 9328885..d62aeaa 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -90,7 +90,7 @@ CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_TWL4030=y
-CONFIG_RTC_DRV_XGENE=m
+# CONFIG_RTC_DRV_XGENE is not set
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_SVW=m
 # CONFIG_SCHED_SMT is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e9ac2cd..fde391c 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -100,7 +100,7 @@ CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTC_DRV_XGENE=m
+# CONFIG_RTC_DRV_XGENE is not set
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_SVW=m
 CONFIG_SCHED_SMT=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index f68be27..7411c67 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -104,7 +104,7 @@ CONFIG_REGULATOR_TWL4030=m
 CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTC_DRV_XGENE=m
+# CONFIG_RTC_DRV_XGENE is not set
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_SVW=y
 # CONFIG_SENSORS_SCH56XX_COMMON is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index dcce993..e6e00b9 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -153,7 +153,7 @@ CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTC_DRV_XGENE=m
+# CONFIG_RTC_DRV_XGENE is not set
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_SVW=m
 CONFIG_SCHED_SMT=y
-- 
2.5.0

More information about the kernel-team mailing list