Minor config cleanups

45 files changed, 23 insertions, 284 deletions

diff --git a/baseconfig/CONFIG_ARM64_SW_TTBR0_PAN b/baseconfig/CONFIG_ARM64_SW_TTBR0_PAN
deleted file mode 100644
index 3b878e832..000000000
--- a/baseconfig/CONFIG_ARM64_SW_TTBR0_PAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
diff --git a/baseconfig/CONFIG_CRYPTO_CRC32_ARM64_CE b/baseconfig/CONFIG_CRYPTO_CRC32_ARM64_CE
deleted file mode 100644
index ee9966699..000000000
--- a/baseconfig/CONFIG_CRYPTO_CRC32_ARM64_CE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
diff --git a/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE b/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
deleted file mode 100644
index c59d53cfb..000000000
--- a/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
diff --git a/baseconfig/CONFIG_CRYPTO_SHA256_ARM64 b/baseconfig/CONFIG_CRYPTO_SHA256_ARM64
deleted file mode 100644
index ba32f8501..000000000
--- a/baseconfig/CONFIG_CRYPTO_SHA256_ARM64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA256_ARM64=m
diff --git a/baseconfig/CONFIG_CRYPTO_SHA512_ARM64 b/baseconfig/CONFIG_CRYPTO_SHA512_ARM64
deleted file mode 100644
index de1c4c957..000000000
--- a/baseconfig/CONFIG_CRYPTO_SHA512_ARM64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA512_ARM64=m
diff --git a/baseconfig/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible b/baseconfig/CONFIG_DEBUG_VM_RB
index fbc8aaef8..fbc8aaef8 100644
--- a/baseconfig/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible
+++ b/baseconfig/CONFIG_DEBUG_VM_RB
diff --git a/baseconfig/CONFIG_DPM_WATCHDOG revisit this in debug b/baseconfig/CONFIG_DPM_WATCHDOG
index c12b35c43..c12b35c43 100644
--- a/baseconfig/CONFIG_DPM_WATCHDOG revisit this in debug
+++ b/baseconfig/CONFIG_DPM_WATCHDOG
diff --git a/baseconfig/CONFIG_FB_INTEL b/baseconfig/CONFIG_FB_INTEL
deleted file mode 100644
index d5ca4253f..000000000
--- a/baseconfig/CONFIG_FB_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_INTEL is not set
diff --git a/baseconfig/CONFIG_FB_INTEL_DEBUG b/baseconfig/CONFIG_FB_INTEL_DEBUG
deleted file mode 100644
index b3ff96e60..000000000
--- a/baseconfig/CONFIG_FB_INTEL_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_INTEL_DEBUG is not set
diff --git a/baseconfig/CONFIG_FB_INTEL_I2C b/baseconfig/CONFIG_FB_INTEL_I2C
deleted file mode 100644
index 7dbd2269f..000000000
--- a/baseconfig/CONFIG_FB_INTEL_I2C
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_INTEL_I2C is not set
diff --git a/baseconfig/CONFIG_RADIO_WL128X depends on TI_ST which we don't enable b/baseconfig/CONFIG_RADIO_WL128X
index da0cf2eb9..da0cf2eb9 100644
--- a/baseconfig/CONFIG_RADIO_WL128X depends on TI_ST which we don't enable
+++ b/baseconfig/CONFIG_RADIO_WL128X
diff --git a/baseconfig/CONFIG_SND_SOC_HDAC_HDMI b/baseconfig/CONFIG_SND_SOC_HDAC_HDMI
new file mode 100644
index 000000000..dfefcf887
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_HDAC_HDMI
@@ -0,0 +1 @@
+CONFIG_SND_SOC_HDAC_HDMI=m
diff --git a/baseconfig/CONFIG_AGP b/baseconfig/powerpc/CONFIG_AGP
index ea543fee8..ea543fee8 100644
--- a/baseconfig/CONFIG_AGP
+++ b/baseconfig/powerpc/CONFIG_AGP
diff --git a/baseconfig/x86/CONFIG_AGP b/baseconfig/x86/CONFIG_AGP
new file mode 100644
index 000000000..ea543fee8
--- /dev/null
+++ b/baseconfig/x86/CONFIG_AGP
@@ -0,0 +1 @@
+CONFIG_AGP=y
diff --git a/baseconfig/CONFIG_AGP_ALI b/baseconfig/x86/CONFIG_AGP_ALI
index c46aee1e8..c46aee1e8 100644
--- a/baseconfig/CONFIG_AGP_ALI
+++ b/baseconfig/x86/CONFIG_AGP_ALI
diff --git a/baseconfig/CONFIG_AGP_AMD b/baseconfig/x86/CONFIG_AGP_AMD
index 142f8a1cd..142f8a1cd 100644
--- a/baseconfig/CONFIG_AGP_AMD
+++ b/baseconfig/x86/CONFIG_AGP_AMD
diff --git a/baseconfig/CONFIG_AGP_AMD64 b/baseconfig/x86/CONFIG_AGP_AMD64
index 97e9526e4..97e9526e4 100644
--- a/baseconfig/CONFIG_AGP_AMD64
+++ b/baseconfig/x86/CONFIG_AGP_AMD64
diff --git a/baseconfig/CONFIG_AGP_ATI b/baseconfig/x86/CONFIG_AGP_ATI
index 1f551caec..1f551caec 100644
--- a/baseconfig/CONFIG_AGP_ATI
+++ b/baseconfig/x86/CONFIG_AGP_ATI
diff --git a/baseconfig/CONFIG_AGP_EFFICEON b/baseconfig/x86/CONFIG_AGP_EFFICEON
index 070b4ae60..070b4ae60 100644
--- a/baseconfig/CONFIG_AGP_EFFICEON
+++ b/baseconfig/x86/CONFIG_AGP_EFFICEON
diff --git a/baseconfig/CONFIG_AGP_INTEL b/baseconfig/x86/CONFIG_AGP_INTEL
index 524a67977..524a67977 100644
--- a/baseconfig/CONFIG_AGP_INTEL
+++ b/baseconfig/x86/CONFIG_AGP_INTEL
diff --git a/baseconfig/CONFIG_AGP_NVIDIA b/baseconfig/x86/CONFIG_AGP_NVIDIA
index f177c1d92..f177c1d92 100644
--- a/baseconfig/CONFIG_AGP_NVIDIA
+++ b/baseconfig/x86/CONFIG_AGP_NVIDIA
diff --git a/baseconfig/CONFIG_AGP_SIS b/baseconfig/x86/CONFIG_AGP_SIS
index dac4635e3..dac4635e3 100644
--- a/baseconfig/CONFIG_AGP_SIS
+++ b/baseconfig/x86/CONFIG_AGP_SIS
diff --git a/baseconfig/CONFIG_AGP_SWORKS b/baseconfig/x86/CONFIG_AGP_SWORKS
index 09d99f431..09d99f431 100644
--- a/baseconfig/CONFIG_AGP_SWORKS
+++ b/baseconfig/x86/CONFIG_AGP_SWORKS
diff --git a/baseconfig/CONFIG_AGP_VIA b/baseconfig/x86/CONFIG_AGP_VIA
index 21da1a429..21da1a429 100644
--- a/baseconfig/CONFIG_AGP_VIA
+++ b/baseconfig/x86/CONFIG_AGP_VIA
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index f1f65d0f0..6233cad29 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -145,17 +145,7 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
 # CONFIG_AGP is not set
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
@@ -1509,9 +1499,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -5005,6 +4992,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 1195fdda0..65265e12f 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -145,17 +145,7 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
 # CONFIG_AGP is not set
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
@@ -1492,9 +1482,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -4982,6 +4969,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 14d69b6d3..43acaf70d 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -124,17 +124,7 @@ CONFIG_AEABI=y
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
 # CONFIG_AGP is not set
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_IMX=m
 CONFIG_AHCI_MVEBU=m
@@ -257,7 +247,6 @@ CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARMADA_THERMAL=m
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_APPENDED_DTB=y
@@ -1652,9 +1641,6 @@ CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_IMX is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -5447,6 +5433,7 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_IMG is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index ef4179471..1189cd87d 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -124,17 +124,7 @@ CONFIG_AEABI=y
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
 # CONFIG_AGP is not set
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
@@ -249,7 +239,6 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARMADA_THERMAL=m
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_APPENDED_DTB=y
@@ -1575,9 +1564,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -5140,6 +5126,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 89d6015d5..ade1672ff 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -124,17 +124,7 @@ CONFIG_AEABI=y
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
 # CONFIG_AGP is not set
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
@@ -249,7 +239,6 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARMADA_THERMAL=m
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_APPENDED_DTB=y
@@ -1559,9 +1548,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -5118,6 +5104,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 2f6979473..14e0d26b1 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -124,17 +124,7 @@ CONFIG_AEABI=y
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
 # CONFIG_AGP is not set
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_IMX=m
 CONFIG_AHCI_MVEBU=m
@@ -257,7 +247,6 @@ CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARMADA_THERMAL=m
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_APPENDED_DTB=y
@@ -1636,9 +1625,6 @@ CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_IMX is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -5425,6 +5411,7 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_IMG is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 5f996ccb4..d2f61e083 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -225,7 +225,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -824,14 +823,12 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -897,10 +894,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1393,9 +1388,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -4764,6 +4756,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 35a7863da..54b713844 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -225,7 +225,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -825,14 +824,12 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -898,10 +895,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1410,9 +1405,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -4785,6 +4777,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 490f9ac26..b1e2edb77 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -225,7 +225,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -825,14 +824,12 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -898,10 +895,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1410,9 +1405,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -4785,6 +4777,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index c8dcfc858..e245fe93b 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -225,7 +225,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -824,14 +823,12 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -897,10 +894,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1393,9 +1388,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -4764,6 +4756,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 318317a3f..8478ae12b 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -125,17 +125,7 @@ CONFIG_AFFS_FS=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
 CONFIG_AGP_UNINORTH=y
-CONFIG_AGP_VIA=y
 CONFIG_AGP=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -187,7 +177,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -821,13 +810,11 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=y
@@ -889,10 +876,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1345,9 +1330,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX_G=y
@@ -4656,6 +4638,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 2cc4ad06a..00cd43beb 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -125,17 +125,7 @@ CONFIG_AFFS_FS=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
 CONFIG_AGP_UNINORTH=y
-CONFIG_AGP_VIA=y
 CONFIG_AGP=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -187,7 +177,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -820,13 +809,11 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=y
@@ -888,10 +875,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1328,9 +1313,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX_G=y
@@ -4633,6 +4615,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index ae87cf9f4..15d615bb6 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -122,16 +122,6 @@ CONFIG_AFFS_FS=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 CONFIG_AGP=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -181,7 +171,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -776,13 +765,11 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=y
@@ -844,10 +831,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1299,9 +1284,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX_G=y
@@ -4585,6 +4567,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 48bee7544..eb3430ad5 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -122,16 +122,6 @@ CONFIG_AFFS_FS=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 CONFIG_AGP=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -181,7 +171,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -775,13 +764,11 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=y
@@ -843,10 +830,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1282,9 +1267,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX_G=y
@@ -4562,6 +4544,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 736b5a7c9..2e8be14bf 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -122,16 +122,6 @@ CONFIG_AFFS_FS=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 CONFIG_AGP=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -181,7 +171,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -776,13 +765,11 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=y
@@ -844,10 +831,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1298,9 +1283,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX_G=y
@@ -4584,6 +4566,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 92abf2172..ef54bb91a 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -122,16 +122,6 @@ CONFIG_AFFS_FS=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
 CONFIG_AGP=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -181,7 +171,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -775,13 +764,11 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=y
@@ -843,10 +830,8 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
@@ -1281,9 +1266,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX_G=y
@@ -4561,6 +4543,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index cd3b70250..56c2d2f2e 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -122,17 +122,6 @@ CONFIG_AFIUCV=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
-CONFIG_AGP=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_AIC79XX_BUILD_FIRMWARE is not set
@@ -183,7 +172,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -773,14 +761,12 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_S390=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=y
@@ -835,11 +821,9 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1_S390=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_S390=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SIMD=y
@@ -1290,9 +1274,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
@@ -4481,6 +4462,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 1d8139bdf..ce053530e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -122,17 +122,6 @@ CONFIG_AFIUCV=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AGP_ALI=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
-CONFIG_AGP=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_AIC79XX_BUILD_FIRMWARE is not set
@@ -183,7 +172,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -772,14 +760,12 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_S390=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=y
@@ -834,11 +820,9 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1_S390=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_S390=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SIMD=y
@@ -1273,9 +1257,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
@@ -4458,6 +4439,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 121f8efca..27449efd2 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -224,7 +224,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -839,14 +838,12 @@ CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_CRYPTD=y
@@ -921,12 +918,10 @@ CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 # CONFIG_CRYPTO_SHA1_MB is not set
 CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_MB=m
 CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
@@ -1440,9 +1435,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -4813,6 +4805,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index aefc4c930..4fb2d12c3 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -224,7 +224,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_TEGRA_186_SOC is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -838,14 +837,12 @@ CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_CRYPTD=y
@@ -920,12 +917,10 @@ CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 # CONFIG_CRYPTO_SHA1_MB is not set
 CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_MB=m
 CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
@@ -1423,9 +1418,6 @@ CONFIG_FB_I810_I2C=y
 CONFIG_FB_I810=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
-# CONFIG_FB_INTEL is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX_G is not set
@@ -4792,6 +4784,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
diff --git a/kernel.spec b/kernel.spec
index 247c931e9..a61769c65 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2183,6 +2183,7 @@ fi
 %changelog
 * Wed Mar  1 2017 Peter Robinson <pbrobinson@fedoraproject.org>
 - Add patch to fix desktop lockups on RPi (vc4) RHBZ# 1389163
+- Minor config cleanups
 
 * Tue Feb 28 2017 Justin M. Forbes <jforbes@fedoraproject.org> 
 - Fix kernel-devel virtual provide