summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/CONFIG_QCA70001
-rw-r--r--baseconfig/CONFIG_QCOM_EMAC1
-rw-r--r--baseconfig/arm/arm64/CONFIG_NET_VENDOR_QUALCOMM1
-rw-r--r--baseconfig/arm/arm64/CONFIG_QCOM_EMAC1
-rw-r--r--kernel-aarch64-debug.config4
-rw-r--r--kernel-aarch64.config4
-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-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-ppc64p7-debug.config2
-rw-r--r--kernel-ppc64p7.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
24 files changed, 46 insertions, 2 deletions
diff --git a/baseconfig/CONFIG_QCA7000 b/baseconfig/CONFIG_QCA7000
new file mode 100644
index 000000000..1a7ec7f1e
--- /dev/null
+++ b/baseconfig/CONFIG_QCA7000
@@ -0,0 +1 @@
+# CONFIG_QCA7000 is not set
diff --git a/baseconfig/CONFIG_QCOM_EMAC b/baseconfig/CONFIG_QCOM_EMAC
new file mode 100644
index 000000000..5f97471b2
--- /dev/null
+++ b/baseconfig/CONFIG_QCOM_EMAC
@@ -0,0 +1 @@
+# CONFIG_QCOM_EMAC is not set
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_QUALCOMM b/baseconfig/arm/arm64/CONFIG_NET_VENDOR_QUALCOMM
new file mode 100644
index 000000000..46be71a90
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_NET_VENDOR_QUALCOMM
@@ -0,0 +1 @@
+CONFIG_NET_VENDOR_QUALCOMM=y
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_EMAC b/baseconfig/arm/arm64/CONFIG_QCOM_EMAC
new file mode 100644
index 000000000..4e3fa019b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_EMAC
@@ -0,0 +1 @@
+CONFIG_QCOM_EMAC=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 55d0348c1..f477032d6 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3403,7 +3403,7 @@ CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_NET_VENDOR_OKI=y
# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
+CONFIG_NET_VENDOR_QUALCOMM=y
CONFIG_NET_VENDOR_RDC=y
CONFIG_NET_VENDOR_REALTEK=y
# CONFIG_NET_VENDOR_RENESAS is not set
@@ -3990,12 +3990,14 @@ CONFIG_PWM_TEGRA=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
CONFIG_QCOM_BAM_DMA=y
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
CONFIG_QCOM_COINCELL=m
# CONFIG_QCOM_EBI2 is not set
+CONFIG_QCOM_EMAC=m
CONFIG_QCOM_GSBI=y
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 159549e4b..ba0734476 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3382,7 +3382,7 @@ CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_NET_VENDOR_OKI=y
# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
+CONFIG_NET_VENDOR_QUALCOMM=y
CONFIG_NET_VENDOR_RDC=y
CONFIG_NET_VENDOR_REALTEK=y
# CONFIG_NET_VENDOR_RENESAS is not set
@@ -3968,12 +3968,14 @@ CONFIG_PWM_TEGRA=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
CONFIG_QCOM_BAM_DMA=y
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
CONFIG_QCOM_COINCELL=m
# CONFIG_QCOM_EBI2 is not set
+CONFIG_QCOM_EMAC=m
CONFIG_QCOM_GSBI=y
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 36ac61c40..3032a00b2 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4357,12 +4357,14 @@ CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
CONFIG_PXA_DMA=y
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
CONFIG_QCOM_BAM_DMA=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
CONFIG_QCOM_COINCELL=m
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
CONFIG_QCOM_GSBI=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 3710ffd19..b643a5e40 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4134,10 +4134,12 @@ CONFIG_PWM_TEGRA=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
# CONFIG_QCOM_SPMI_IADC is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 682bff2bd..4edcafa5c 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4113,10 +4113,12 @@ CONFIG_PWM_TEGRA=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
# CONFIG_QCOM_SPMI_IADC is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index aff7d8cff..680b6fafb 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4336,12 +4336,14 @@ CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
CONFIG_PXA_DMA=y
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
CONFIG_QCOM_BAM_DMA=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
CONFIG_QCOM_COINCELL=m
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
CONFIG_QCOM_GSBI=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 7c1fc6e49..109650fea 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3885,10 +3885,12 @@ CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 57eccda35..49dd7e3ff 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3905,10 +3905,12 @@ CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 319b34fda..698c7da75 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3905,10 +3905,12 @@ CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 45515acff..2e70a61d3 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3885,10 +3885,12 @@ CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 13c20c22f..0c5039eb4 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3764,10 +3764,12 @@ CONFIG_PWM_HIBVT=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 1556a2b04..0e1fea869 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3742,10 +3742,12 @@ CONFIG_PWM_HIBVT=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 35276cab4..3c92cb3aa 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3704,10 +3704,12 @@ CONFIG_PWM_HIBVT=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 5c5430d68..58f1fda2b 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3682,10 +3682,12 @@ CONFIG_PWM_HIBVT=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 56e96d3bf..aa08263b1 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -3703,10 +3703,12 @@ CONFIG_PWM_HIBVT=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 6b6265e37..0502156e7 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -3681,10 +3681,12 @@ CONFIG_PWM_HIBVT=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 54d888fea..6ca17b952 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3583,10 +3583,12 @@ CONFIG_PWM_HIBVT=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QDIO=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index a006b572c..556cdfd17 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3561,10 +3561,12 @@ CONFIG_PWM_HIBVT=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QDIO=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index b4665a013..088a4ea25 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3925,10 +3925,12 @@ CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 706206c57..930f7233a 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3905,10 +3905,12 @@ CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
+# CONFIG_QCA7000 is not set
CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_CLK_RPM is not set
# CONFIG_QCOM_CLK_SMD_RPM is not set
# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EMAC is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m