summaryrefslogtreecommitdiffstats
path: root/baseconfig
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2018-04-18 00:10:20 +0100
committerJeremy Cline <jeremy@jcline.org>2018-04-19 14:22:54 -0400
commit271a43937a02e02733cf72b1394b832310061ae9 (patch)
treed3cb9766942f679db6f2cfad29bf651ddecf52a6 /baseconfig
parent2bafd9f6c10039835db316dbe6ddd6814534020e (diff)
downloadkernel-271a43937a02e02733cf72b1394b832310061ae9.tar.gz
kernel-271a43937a02e02733cf72b1394b832310061ae9.tar.xz
kernel-271a43937a02e02733cf72b1394b832310061ae9.zip
Enable drivers for Xilinx ZYMQ-MP Ultra96
Diffstat (limited to 'baseconfig')
-rw-r--r--baseconfig/CONFIG_SPI_CADENCE (renamed from baseconfig/x86/CONFIG_SPI_CADENCE)0
-rw-r--r--baseconfig/arm/CONFIG_CADENCE_WATCHDOG2
-rw-r--r--baseconfig/arm/CONFIG_I2C_CADENCE (renamed from baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE)0
-rw-r--r--baseconfig/arm/CONFIG_SPI_CADENCE2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE1
6 files changed, 2 insertions, 4 deletions
diff --git a/baseconfig/x86/CONFIG_SPI_CADENCE b/baseconfig/CONFIG_SPI_CADENCE
index 78e16ec97..78e16ec97 100644
--- a/baseconfig/x86/CONFIG_SPI_CADENCE
+++ b/baseconfig/CONFIG_SPI_CADENCE
diff --git a/baseconfig/arm/CONFIG_CADENCE_WATCHDOG b/baseconfig/arm/CONFIG_CADENCE_WATCHDOG
index 3892db328..85b4e115d 100644
--- a/baseconfig/arm/CONFIG_CADENCE_WATCHDOG
+++ b/baseconfig/arm/CONFIG_CADENCE_WATCHDOG
@@ -1 +1 @@
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE b/baseconfig/arm/CONFIG_I2C_CADENCE
index 8e1eefa5c..8e1eefa5c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE
+++ b/baseconfig/arm/CONFIG_I2C_CADENCE
diff --git a/baseconfig/arm/CONFIG_SPI_CADENCE b/baseconfig/arm/CONFIG_SPI_CADENCE
index 78e16ec97..3a8bb168c 100644
--- a/baseconfig/arm/CONFIG_SPI_CADENCE
+++ b/baseconfig/arm/CONFIG_SPI_CADENCE
@@ -1 +1 @@
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
deleted file mode 100644
index 85b4e115d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CADENCE_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE b/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE
deleted file mode 100644
index 3a8bb168c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_CADENCE=m