summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-10-02 12:14:01 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-10-02 12:14:01 +0100
commite8d02b72a6df1774a835dd140980f71b3fef34f7 (patch)
tree4f4323fcdc87fb19bcf7bbdb0084e2f241b4c3fd
parent6af9855755241e7596349612768d856df45a4808 (diff)
downloadkernel-e8d02b72a6df1774a835dd140980f71b3fef34f7.tar.gz
kernel-e8d02b72a6df1774a835dd140980f71b3fef34f7.tar.xz
kernel-e8d02b72a6df1774a835dd140980f71b3fef34f7.zip
ChromeOS updates v2
-rw-r--r--configs/fedora/generic/CONFIG_CROS_EC_CHARDEV1
-rw-r--r--configs/fedora/generic/arm/CONFIG_CROS_EC_CHARDEV1
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_CHARDEV1
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-debug.config1
-rw-r--r--kernel-i686.config1
-rw-r--r--kernel-ppc64le-debug.config1
-rw-r--r--kernel-ppc64le.config1
-rw-r--r--kernel-s390x-debug.config1
-rw-r--r--kernel-s390x.config1
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
17 files changed, 10 insertions, 15 deletions
diff --git a/configs/fedora/generic/CONFIG_CROS_EC_CHARDEV b/configs/fedora/generic/CONFIG_CROS_EC_CHARDEV
deleted file mode 100644
index 3fab49bb4..000000000
--- a/configs/fedora/generic/CONFIG_CROS_EC_CHARDEV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CROS_EC_CHARDEV is not set
diff --git a/configs/fedora/generic/arm/CONFIG_CROS_EC_CHARDEV b/configs/fedora/generic/arm/CONFIG_CROS_EC_CHARDEV
new file mode 100644
index 000000000..a3df83240
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_CROS_EC_CHARDEV
@@ -0,0 +1 @@
+CONFIG_CROS_EC_CHARDEV=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_CHARDEV b/configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_CHARDEV
new file mode 100644
index 000000000..a3df83240
--- /dev/null
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_CHARDEV
@@ -0,0 +1 @@
+CONFIG_CROS_EC_CHARDEV=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index dfdb5fcd5..dbc949f1e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1088,7 +1088,7 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_CHARDEV=m
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index f9b3acfe0..e2fcff0a2 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1088,7 +1088,7 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_CHARDEV=m
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index cc3869e0a..79ab1e0ce 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1083,7 +1083,7 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_CHARDEV=m
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 7cff58982..5c6ef4a6f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1050,7 +1050,7 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_CHARDEV=m
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 73a6b815e..e2e594cff 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1050,7 +1050,7 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_CHARDEV=m
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 8bb6986ea..5fb99fb42 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1083,7 +1083,7 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_CHARDEV=m
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 604f08ccd..534a21f04 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -885,7 +885,6 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 8b18cf5c9..0d0f48582 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -884,7 +884,6 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 4161f5d17..316e6e492 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -823,7 +823,6 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 502e2d3ec..fec43aed8 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -822,7 +822,6 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index e8f5a313a..301d9d7eb 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -829,7 +829,6 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 31a55bab9..e9c67dc4f 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -828,7 +828,6 @@ CONFIG_CRC8=m
CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index fd54633d9..3e92006d3 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -899,7 +899,7 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_CHARDEV=m
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 6e69df2e1..6aa6c712b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -898,7 +898,7 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_CHARDEV=m
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC is not set