summaryrefslogtreecommitdiffstats
path: root/baseconfig
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-09-24 15:23:59 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-09-24 15:23:59 +0100
commit4ad84e15bc04bcc7cd075d3547030602cf3c2cb3 (patch)
treecb795a2c5d74cf456ff5cf98dda59325d80fddc2 /baseconfig
parent7e73dd7a7eba9f9e19b532ff24ed60182e55c5e5 (diff)
downloadkernel-4ad84e15bc04bcc7cd075d3547030602cf3c2cb3.tar.gz
kernel-4ad84e15bc04bcc7cd075d3547030602cf3c2cb3.tar.xz
kernel-4ad84e15bc04bcc7cd075d3547030602cf3c2cb3.zip
cleanup some deprecated options, minor arm config tweaks
Diffstat (limited to 'baseconfig')
-rw-r--r--baseconfig/CONFIG_BLK_DEV_UB1
-rw-r--r--baseconfig/CONFIG_BT_SCO1
-rw-r--r--baseconfig/CONFIG_CHARGER_QCOM_SMBB1
-rw-r--r--baseconfig/CONFIG_DP83867_PHY2
-rw-r--r--baseconfig/CONFIG_EXPERIMENTAL1
-rw-r--r--baseconfig/CONFIG_INOTIFY1
-rw-r--r--baseconfig/CONFIG_USB_LED1
-rw-r--r--baseconfig/arm/CONFIG_ARCH_BCM_IPROC (renamed from baseconfig/arm/arm64/CONFIG_ARCH_BCM_IPROC)0
-rw-r--r--baseconfig/arm/CONFIG_IOMMU_DMA1
-rw-r--r--baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC (renamed from baseconfig/arm/CONFIG_MFD_SPMI_PMIC)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS1
15 files changed, 7 insertions, 7 deletions
diff --git a/baseconfig/CONFIG_BLK_DEV_UB b/baseconfig/CONFIG_BLK_DEV_UB
deleted file mode 100644
index 6fbfd13fb..000000000
--- a/baseconfig/CONFIG_BLK_DEV_UB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_UB is not set
diff --git a/baseconfig/CONFIG_BT_SCO b/baseconfig/CONFIG_BT_SCO
deleted file mode 100644
index c04760986..000000000
--- a/baseconfig/CONFIG_BT_SCO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BT_SCO=y
diff --git a/baseconfig/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/CONFIG_CHARGER_QCOM_SMBB
deleted file mode 100644
index c06d8f1f1..000000000
--- a/baseconfig/CONFIG_CHARGER_QCOM_SMBB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHARGER_QCOM_SMBB is not set
diff --git a/baseconfig/CONFIG_DP83867_PHY b/baseconfig/CONFIG_DP83867_PHY
index 5ba3d57bd..2bb3289c3 100644
--- a/baseconfig/CONFIG_DP83867_PHY
+++ b/baseconfig/CONFIG_DP83867_PHY
@@ -1 +1 @@
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
diff --git a/baseconfig/CONFIG_EXPERIMENTAL b/baseconfig/CONFIG_EXPERIMENTAL
deleted file mode 100644
index 8c91d40b9..000000000
--- a/baseconfig/CONFIG_EXPERIMENTAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXPERIMENTAL=y
diff --git a/baseconfig/CONFIG_INOTIFY b/baseconfig/CONFIG_INOTIFY
deleted file mode 100644
index 78343a1d2..000000000
--- a/baseconfig/CONFIG_INOTIFY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INOTIFY=y
diff --git a/baseconfig/CONFIG_USB_LED b/baseconfig/CONFIG_USB_LED
deleted file mode 100644
index 445af6c46..000000000
--- a/baseconfig/CONFIG_USB_LED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_LED=m
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_BCM_IPROC b/baseconfig/arm/CONFIG_ARCH_BCM_IPROC
index d60fe565f..d60fe565f 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_BCM_IPROC
+++ b/baseconfig/arm/CONFIG_ARCH_BCM_IPROC
diff --git a/baseconfig/arm/CONFIG_IOMMU_DMA b/baseconfig/arm/CONFIG_IOMMU_DMA
new file mode 100644
index 000000000..a9155fba1
--- /dev/null
+++ b/baseconfig/arm/CONFIG_IOMMU_DMA
@@ -0,0 +1 @@
+CONFIG_IOMMU_DMA=y
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB
new file mode 100644
index 000000000..43a91eb0e
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB
@@ -0,0 +1 @@
+CONFIG_CHARGER_QCOM_SMBB=m
diff --git a/baseconfig/arm/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC
index 6360fee39..6360fee39 100644
--- a/baseconfig/arm/CONFIG_MFD_SPMI_PMIC
+++ b/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS b/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS
new file mode 100644
index 000000000..5e2512c4c
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS
@@ -0,0 +1 @@
+CONFIG_VIDEO_QCOM_CAMSS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
new file mode 100644
index 000000000..43a91eb0e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
@@ -0,0 +1 @@
+CONFIG_CHARGER_QCOM_SMBB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
new file mode 100644
index 000000000..6360fee39
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
@@ -0,0 +1 @@
+CONFIG_MFD_SPMI_PMIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
new file mode 100644
index 000000000..5e2512c4c
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
@@ -0,0 +1 @@
+CONFIG_VIDEO_QCOM_CAMSS=m