]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/blobdiff - kernel/config-arm32-generic
hide kernel addresses in /proc against privileged users
[people/pmueller/ipfire-3.x.git] / kernel / config-arm32-generic
index 35b003606d7c2dc1f019a493f22955ad514347b5..14f999bcb38591acce1cc39f81246dea7e26a98c 100644 (file)
@@ -1,12 +1,3 @@
-CONFIG_ARM=y
-CONFIG_ARM_HAS_SG_CHAIN=y
-CONFIG_ARM_DMA_USE_IOMMU=y
-CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
-CONFIG_MIGHT_HAVE_PCI=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_NO_IOPORT_MAP=y
-CONFIG_ARCH_HAS_BANDGAP=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
 
 #
 # General setup
@@ -26,24 +17,22 @@ CONFIG_PERF_USE_VMALLOC=y
 #
 # Kernel Performance Events And Counters
 #
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
-CONFIG_ARCH_MMAP_RND_BITS=16
-CONFIG_OLD_SIGACTION=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_LBDAF=y
+CONFIG_ARM=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
+CONFIG_MIGHT_HAVE_PCI=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_NO_IOPORT_MAP=y
+CONFIG_ARCH_HAS_BANDGAP=y
+CONFIG_ZONE_DMA=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
 
 #
 # System Type
 #
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
@@ -70,7 +59,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
-# CONFIG_ARCH_MULTI_CPU_AUTO is not set
 CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
@@ -103,6 +91,29 @@ CONFIG_ARCH_BERLIN=y
 # CONFIG_MACH_BERLIN_BG2CD is not set
 # CONFIG_MACH_BERLIN_BG2Q is not set
 # CONFIG_ARCH_DIGICOLOR is not set
+CONFIG_ARCH_EXYNOS=y
+CONFIG_S5P_DEV_MFC=y
+# CONFIG_ARCH_EXYNOS3 is not set
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_ARCH_EXYNOS5=y
+
+#
+# EXYNOS SoCs
+#
+CONFIG_CPU_EXYNOS4210=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5260=y
+CONFIG_SOC_EXYNOS5410=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5800=y
+# CONFIG_EXYNOS5420_MCPM is not set
+CONFIG_EXYNOS_CPU_SUSPEND=y
+CONFIG_PLAT_SAMSUNG=y
+
+#
+# Power management
+#
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HISI=y
 
@@ -113,10 +124,6 @@ CONFIG_ARCH_HI3xxx=y
 # CONFIG_ARCH_HIP01 is not set
 CONFIG_ARCH_HIP04=y
 CONFIG_ARCH_HIX5HD2=y
-CONFIG_ARCH_KEYSTONE=y
-CONFIG_MACH_MESON6=y
-CONFIG_MACH_MESON8=y
-CONFIG_MACH_MESON8B=y
 CONFIG_ARCH_MXC=y
 
 #
@@ -128,17 +135,19 @@ CONFIG_ARCH_MXC=y
 CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SLL=y
 CONFIG_SOC_IMX6SX=y
 # CONFIG_SOC_IMX6UL is not set
-# CONFIG_SOC_IMX7D is not set
 # CONFIG_SOC_LS1021A is not set
 
 #
 # Cortex-A/Cortex-M asymmetric multiprocessing platforms
 #
+# CONFIG_SOC_IMX7D is not set
 CONFIG_SOC_VF610=y
 CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
 # CONFIG_VF_USE_PIT_TIMER is not set
+CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MEDIATEK=y
 # CONFIG_MACH_MT2701 is not set
 CONFIG_MACH_MT6589=y
@@ -146,6 +155,10 @@ CONFIG_MACH_MT6592=y
 CONFIG_MACH_MT7623=y
 CONFIG_MACH_MT8127=y
 CONFIG_MACH_MT8135=y
+CONFIG_MACH_MESON6=y
+CONFIG_MACH_MESON8=y
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_NPCM is not set
 CONFIG_ARCH_OMAP=y
 
 #
@@ -155,8 +168,6 @@ CONFIG_ARCH_OMAP=y
 # CONFIG_OMAP_RESET_CLOCKS is not set
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
 
 #
@@ -188,7 +199,15 @@ CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_OMAP3_PANDORA=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_OMAP5_ERRATA_801819=y
-# CONFIG_ARCH_MMP is not set
+CONFIG_ARCH_SIRF=y
+
+#
+# CSR SiRF atlas6/primaII/Atlas7 Specific Features
+#
+CONFIG_ARCH_ATLAS6=y
+CONFIG_ARCH_ATLAS7=y
+CONFIG_ARCH_PRIMA2=y
+CONFIG_SIRF_IRQ=y
 CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_MSM8X60 is not set
 # CONFIG_ARCH_MSM8960 is not set
@@ -196,43 +215,14 @@ CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_MDM9615 is not set
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_ROCKCHIP=y
+# CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_ARCH_STI=y
 CONFIG_SOC_STIH415=y
 CONFIG_SOC_STIH416=y
 CONFIG_SOC_STIH407=y
-# CONFIG_ARCH_S5PV210 is not set
-CONFIG_ARCH_EXYNOS=y
-CONFIG_S5P_DEV_MFC=y
-# CONFIG_ARCH_EXYNOS3 is not set
-CONFIG_ARCH_EXYNOS4=y
-CONFIG_ARCH_EXYNOS5=y
-
-#
-# EXYNOS SoCs
-#
-CONFIG_CPU_EXYNOS4210=y
-CONFIG_SOC_EXYNOS4412=y
-CONFIG_SOC_EXYNOS5250=y
-CONFIG_SOC_EXYNOS5260=y
-CONFIG_SOC_EXYNOS5410=y
-CONFIG_SOC_EXYNOS5420=y
-CONFIG_SOC_EXYNOS5440=y
-CONFIG_SOC_EXYNOS5800=y
-# CONFIG_EXYNOS5420_MCPM is not set
-CONFIG_EXYNOS_CPU_SUSPEND=y
-CONFIG_PLAT_SAMSUNG=y
-
-#
-# Boot options
-#
-# CONFIG_SAMSUNG_ATAGS is not set
-
-#
-# Power management
-#
-# CONFIG_SAMSUNG_PM_CHECK is not set
+# CONFIG_ARCH_STM32 is not set
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_MACH_SUN5I=y
@@ -240,23 +230,11 @@ CONFIG_MACH_SUN6I=y
 CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
-CONFIG_ARCH_SIRF=y
-
-#
-# CSR SiRF atlas6/primaII/Atlas7 Specific Features
-#
-CONFIG_ARCH_ATLAS6=y
-CONFIG_ARCH_ATLAS7=y
-CONFIG_ARCH_PRIMA2=y
-CONFIG_SIRF_IRQ=y
+CONFIG_ARCH_SUNXI_MC_SMP=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
-CONFIG_MACH_MOP500=y
-# CONFIG_MACH_HREFV60 is not set
-# CONFIG_MACH_SNOWBALL is not set
-CONFIG_UX500_AUTO_PLATFORM=y
 CONFIG_UX500_DEBUG_UART=2
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_DCSCB=y
@@ -295,17 +273,18 @@ CONFIG_CPU_CP15_MMU=y
 # Processor Features
 #
 # CONFIG_ARM_LPAE is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARM_THUMB=y
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_SPECTRE=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_CACHE_B15_RAC=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_CACHE_L2X0=y
 # CONFIG_CACHE_L2X0_PMU is not set
@@ -319,7 +298,6 @@ CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_HEAVY_MB=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_DEBUG_ALIGN_RODATA=y
-CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_643719=y
 CONFIG_ARM_ERRATA_720789=y
@@ -328,39 +306,39 @@ CONFIG_ARM_ERRATA_754327=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
-# CONFIG_ARM_ERRATA_773022 is not set
-# CONFIG_ARM_ERRATA_818325_852422 is not set
-# CONFIG_ARM_ERRATA_821420 is not set
-# CONFIG_ARM_ERRATA_825619 is not set
-# CONFIG_ARM_ERRATA_852421 is not set
-# CONFIG_ARM_ERRATA_852423 is not set
-
-#
-# DesignWare PCI Core Support
-#
-CONFIG_PCI_EXYNOS=y
-CONFIG_PCI_IMX6=y
-CONFIG_PCI_KEYSTONE=y
-CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_HISI_STB=y
+CONFIG_ARM_ERRATA_773022=y
+CONFIG_ARM_ERRATA_818325_852422=y
+CONFIG_ARM_ERRATA_821420=y
+CONFIG_ARM_ERRATA_825619=y
+CONFIG_ARM_ERRATA_852421=y
+CONFIG_ARM_ERRATA_852423=y
+CONFIG_KRAIT_L2_ACCESSORS=y
 
 #
-# PCI host controller drivers
+# Cadence PCIe controllers support
 #
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_TEGRA=y
-CONFIG_PCIE_XILINX=y
 CONFIG_PCI_V3_SEMI=y
 CONFIG_PCIE_IPROC=m
 CONFIG_PCIE_IPROC_PLATFORM=m
 # CONFIG_PCIE_IPROC_BCMA is not set
 CONFIG_PCIE_IPROC_MSI=y
 CONFIG_PCIE_ALTERA=y
-# CONFIG_PCIE_ALTERA_MSI is not set
-# CONFIG_PCIE_ROCKCHIP is not set
+CONFIG_PCIE_ALTERA_MSI=y
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
 # CONFIG_PCIE_MEDIATEK is not set
 
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_KEYSTONE=y
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_HISI_STB=y
+
 #
 # PCI switch controller drivers
 #
@@ -384,26 +362,18 @@ CONFIG_NR_CPUS=4
 CONFIG_ARM_PSCI=y
 CONFIG_ARCH_NR_GPIO=1024
 CONFIG_HZ_FIXED=0
-CONFIG_HZ_100=y
 # CONFIG_HZ_200 is not set
-# CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
-CONFIG_HZ=100
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
-CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_HIGHMEM=y
-# CONFIG_HIGHPTE is not set
+CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-# CONFIG_ARM_MODULE_PLTS is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ARM_MODULE_PLTS=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -428,11 +398,9 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU frequency scaling drivers
 #
-CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
-# CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG is not set
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
-# CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
-CONFIG_ARM_EXYNOS5440_CPUFREQ=y
+CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
+CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
+CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=m
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_ARM_MEDIATEK_CPUFREQ=m
@@ -440,16 +408,16 @@ CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_STI_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=m
-# CONFIG_ARM_TI_CPUFREQ is not set
+CONFIG_ARM_TI_CPUFREQ=y
 
 #
 # ARM CPU Idle Drivers
 #
-# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
-# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
-# CONFIG_ARM_ZYNQ_CPUIDLE is not set
-# CONFIG_ARM_U8500_CPUIDLE is not set
-# CONFIG_ARM_EXYNOS_CPUIDLE is not set
+CONFIG_ARM_BIG_LITTLE_CPUIDLE=y
+CONFIG_ARM_HIGHBANK_CPUIDLE=y
+CONFIG_ARM_ZYNQ_CPUIDLE=y
+CONFIG_ARM_U8500_CPUIDLE=y
+CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
@@ -460,16 +428,69 @@ CONFIG_VFPv3=y
 CONFIG_NEON=y
 
 #
-# Userspace binary formats
+# Power management options
+#
+CONFIG_APM_EMULATION=y
+CONFIG_ARM_CPU_SUSPEND=y
+
+#
+# Firmware Drivers
+#
+CONFIG_QCOM_SCM=y
+CONFIG_QCOM_SCM_32=y
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_TI_SCI_PROTOCOL=m
+CONFIG_BCM47XX_NVRAM=y
+# CONFIG_BCM47XX_SPROM is not set
+# CONFIG_IMX_SCU is not set
+
+#
+# Tegra firmware driver
+#
+# CONFIG_TEGRA_IVC is not set
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA1_ARM_CE=m
+CONFIG_CRYPTO_SHA2_ARM_CE=m
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_AES_ARM_BS=m
+CONFIG_CRYPTO_AES_ARM_CE=m
+CONFIG_CRYPTO_GHASH_ARM_CE=m
+CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
+CONFIG_CRYPTO_CRC32_ARM_CE=m
+
+#
+# General architecture-dependent options
+#
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_MMAP_RND_BITS=16
+CONFIG_OLD_SIGACTION=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_LBDAF=y
+
+#
+# Executable file formats
 #
 # CONFIG_BINFMT_ELF_FDPIC is not set
 # CONFIG_BINFMT_FLAT is not set
 
 #
-# Power management options
+# Memory Management options
 #
-CONFIG_APM_EMULATION=y
-CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_BOUNCE=y
 
 #
 # Classification
@@ -482,7 +503,7 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_TEGRA_AHB=y
 
 #
-# Generic Driver Options
+# Firmware loader
 #
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 
@@ -495,6 +516,7 @@ CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_OMAP_INTERCONNECT=y
 # CONFIG_OMAP_OCP2SCP is not set
 CONFIG_QCOM_EBI2=y
+# CONFIG_SUN50I_DE2_BUS is not set
 CONFIG_SUNXI_RSB=m
 CONFIG_TEGRA_GMI=m
 CONFIG_TI_SYSC=y
@@ -515,6 +537,7 @@ CONFIG_SRAM_EXEC=y
 # SCSI Transports
 #
 CONFIG_SCSI_UFS_QCOM=m
+# CONFIG_SCSI_UFS_HISI is not set
 CONFIG_SCSI_NSP32=m
 
 #
@@ -545,10 +568,10 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_ARC_EMAC_CORE=m
 CONFIG_EMAC_ROCKCHIP=m
-# CONFIG_MACB is not set
 CONFIG_BGMAC=y
 CONFIG_BGMAC_BCMA=m
 CONFIG_BGMAC_PLATFORM=y
+# CONFIG_MACB is not set
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_CS89x0=m
@@ -563,7 +586,6 @@ CONFIG_FEC=m
 CONFIG_FSL_PQ_MDIO=m
 CONFIG_FSL_XGMAC_MDIO=m
 CONFIG_GIANFAR=m
-# CONFIG_MVNETA_BM is not set
 CONFIG_PXA168_ETH=m
 CONFIG_NET_VENDOR_MEDIATEK=y
 CONFIG_NET_MEDIATEK_SOC=m
@@ -588,6 +610,11 @@ CONFIG_MDIO_BUS_MUX=y
 CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
 CONFIG_MDIO_SUN4I=m
 
+#
+# MII PHY device drivers
+#
+CONFIG_ATH10K_SNOC=m
+
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
 #
@@ -611,7 +638,6 @@ CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_NOMADIK is not set
 CONFIG_KEYBOARD_TEGRA=m
 CONFIG_KEYBOARD_PMIC8XXX=m
-CONFIG_KEYBOARD_SAMSUNG=y
 # CONFIG_KEYBOARD_ST_KEYSCAN is not set
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 # CONFIG_INPUT_AB8500_PONKEY is not set
@@ -659,10 +685,10 @@ CONFIG_HW_RANDOM_OMAP=y
 CONFIG_HW_RANDOM_OMAP3_ROM=y
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_HISI=y
-CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_ST=m
 CONFIG_HW_RANDOM_MTK=y
-CONFIG_NVRAM=y
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_KEYSTONE=m
 
 #
 # PC SMBus host controller drivers
@@ -703,16 +729,10 @@ CONFIG_SPMI_MSM_PMIC_ARB=m
 #
 CONFIG_OMAP_SSI=m
 
-#
-# HSI clients
-#
-CONFIG_PPS=y
-
 #
 # PTP clock support
 #
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_GIANFAR=m
+CONFIG_PTP_1588_CLOCK_QORIQ=m
 
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
@@ -727,25 +747,22 @@ CONFIG_PINCTRL_ST=y
 # CONFIG_PINCTRL_PALMAS is not set
 CONFIG_PINCTRL_ZYNQ=y
 CONFIG_PINCTRL_IPROC_GPIO=y
+CONFIG_PINCTRL_NS=y
 CONFIG_PINCTRL_NS2_MUX=y
 CONFIG_PINCTRL_BERLIN=y
-# CONFIG_PINCTRL_BERLIN_BG2 is not set
-# CONFIG_PINCTRL_BERLIN_BG2CD is not set
-# CONFIG_PINCTRL_BERLIN_BG2Q is not set
+CONFIG_PINCTRL_AS370=y
 CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SL=y
+CONFIG_PINCTRL_IMX6SLL=y
 CONFIG_PINCTRL_IMX6SX=y
 CONFIG_PINCTRL_VF610=y
 CONFIG_PINCTRL_ABX500=y
 CONFIG_PINCTRL_AB8500=y
-CONFIG_PINCTRL_AB8540=y
-CONFIG_PINCTRL_AB9540=y
 CONFIG_PINCTRL_AB8505=y
 CONFIG_PINCTRL_NOMADIK=y
 CONFIG_PINCTRL_DB8500=y
-CONFIG_PINCTRL_DB8540=y
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_APQ8064=y
 CONFIG_PINCTRL_APQ8084=y
@@ -759,12 +776,15 @@ CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8994=m
 CONFIG_PINCTRL_MSM8996=m
+CONFIG_PINCTRL_MSM8998=m
+CONFIG_PINCTRL_QCS404=m
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
+CONFIG_PINCTRL_SDM660=m
+CONFIG_PINCTRL_SDM845=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS_ARM=y
-CONFIG_PINCTRL_EXYNOS5440=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUN4I_A10=y
 CONFIG_PINCTRL_SUN5I=y
@@ -780,9 +800,6 @@ CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN8I_V3S=y
 CONFIG_PINCTRL_SUN9I_A80=y
 CONFIG_PINCTRL_SUN9I_A80_R=y
-# CONFIG_PINCTRL_SUN50I_A64 is not set
-# CONFIG_PINCTRL_SUN50I_A64_R is not set
-# CONFIG_PINCTRL_SUN50I_H5 is not set
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
@@ -791,8 +808,16 @@ CONFIG_PINCTRL_TEGRA124=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
 CONFIG_PINCTRL_TI_IODELAY=y
 # CONFIG_PINCTRL_WM8850 is not set
+
+#
+# MediaTek pinctrl drivers
+#
+CONFIG_EINT_MTK=y
 CONFIG_PINCTRL_MTK=y
+CONFIG_PINCTRL_MTK_MOORE=y
+CONFIG_PINCTRL_MTK_PARIS=y
 # CONFIG_PINCTRL_MT2701 is not set
+CONFIG_PINCTRL_MT7623=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT6397=y
@@ -831,8 +856,8 @@ CONFIG_GPIO_TS4900=m
 # CONFIG_ROCKCHIP_IODOMAIN is not set
 CONFIG_POWER_RESET_BRCMKONA=y
 CONFIG_POWER_RESET_HISI=y
-CONFIG_POWER_RESET_IMX=y
 # CONFIG_POWER_RESET_MSM is not set
+CONFIG_POWER_RESET_QCOM_PON=m
 CONFIG_POWER_RESET_ST=y
 CONFIG_POWER_RESET_VERSATILE=y
 CONFIG_POWER_RESET_KEYSTONE=y
@@ -888,6 +913,7 @@ CONFIG_QCOM_TSENS=m
 #
 # Watchdog Device Drivers
 #
+CONFIG_FTWDT010_WATCHDOG=m
 CONFIG_S3C2410_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_DAVINCI_WATCHDOG=m
@@ -904,7 +930,7 @@ CONFIG_BCM47XX_WDT=m
 CONFIG_BCM7038_WDT=m
 
 #
-# Sonics Silicon Backplane
+# Watchdog Pretimeout Governors
 #
 CONFIG_SSB_HOST_SOC=y
 
@@ -955,6 +981,11 @@ CONFIG_IR_RX51=m
 # CONFIG_RC_ST is not set
 CONFIG_IR_SUNXI=m
 
+#
+# Multimedia core support
+#
+# CONFIG_CEC_PIN_ERROR_INJ is not set
+
 #
 # Media digital TV PCI Adapters
 #
@@ -965,7 +996,7 @@ CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_AM437X_VPFE is not set
 # CONFIG_VIDEO_TI_CAL is not set
 # CONFIG_VIDEO_CODA is not set
-# CONFIG_VIDEO_IMX_VDOA is not set
+# CONFIG_VIDEO_IMX_PXP is not set
 # CONFIG_VIDEO_MEDIATEK_JPEG is not set
 CONFIG_VIDEO_MEDIATEK_VPU=m
 CONFIG_VIDEO_MEDIATEK_MDP=m
@@ -1022,9 +1053,9 @@ CONFIG_DRM_EXYNOS_MIC=y
 #
 # Sub-drivers
 #
-CONFIG_DRM_EXYNOS_IPP=y
 # CONFIG_DRM_EXYNOS_FIMC is not set
 # CONFIG_DRM_EXYNOS_ROTATOR is not set
+# CONFIG_DRM_EXYNOS_SCALER is not set
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
@@ -1032,13 +1063,17 @@ CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
+CONFIG_ROCKCHIP_RGB=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
 CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
+CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 CONFIG_DRM_OMAP=m
 CONFIG_OMAP2_DSS_INIT=y
 CONFIG_OMAP_DSS_BASE=m
@@ -1071,6 +1106,7 @@ CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
 # CONFIG_DRM_TILCDC is not set
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+# CONFIG_DRM_MSM_GPU_SUDO is not set
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_DSI_PLL=y
@@ -1078,6 +1114,7 @@ CONFIG_DRM_MSM_DSI_28NM_PHY=y
 CONFIG_DRM_MSM_DSI_20NM_PHY=y
 CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
 CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_FSL_DCU=m
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
@@ -1089,14 +1126,15 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
+CONFIG_DRM_V3D=m
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
-# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
 # CONFIG_DRM_TVE200 is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
 # Frame buffer hardware drivers
@@ -1104,12 +1142,29 @@ CONFIG_DRM_MEDIATEK_HDMI=m
 # CONFIG_FB_IMX is not set
 # CONFIG_FB_VT8500 is not set
 # CONFIG_FB_WM8505 is not set
-# CONFIG_FB_S3C is not set
 # CONFIG_FB_XILINX is not set
 # CONFIG_FB_DA8XX is not set
 # CONFIG_FB_MX3 is not set
 # CONFIG_FB_MXS is not set
 
+#
+# Console display driver support
+#
+CONFIG_SND_ALS300=m
+# CONFIG_SND_ALI5451 is not set
+CONFIG_SND_AZT3328=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+# CONFIG_SND_ES1968_INPUT is not set
+CONFIG_SND_ICE1712=m
+CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_MAESTRO3_INPUT is not set
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+
 #
 # HD-Audio
 #
@@ -1131,7 +1186,6 @@ CONFIG_SND_SOC_IMX_SSI=m
 # SoC Audio support for Freescale i.MX boards:
 #
 CONFIG_SND_SOC_EUKREA_TLV320=m
-CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
@@ -1140,11 +1194,16 @@ CONFIG_SND_SOC_MEDIATEK=m
 CONFIG_SND_SOC_MT2701=m
 CONFIG_SND_SOC_MT2701_CS42448=m
 CONFIG_SND_SOC_MT2701_WM8960=m
+CONFIG_SND_SOC_MT6797=m
 CONFIG_SND_SOC_MT8173=m
 CONFIG_SND_SOC_MT8173_MAX98090=m
 CONFIG_SND_SOC_MT8173_RT5650=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
+
+#
+# ASoC support for Amlogic platforms
+#
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
@@ -1183,6 +1242,7 @@ CONFIG_SND_SUN8I_CODEC=m
 CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
+CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
 CONFIG_SND_SOC_UX500=m
 CONFIG_SND_SOC_UX500_PLAT_DMA=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
@@ -1193,14 +1253,15 @@ CONFIG_SND_SOC_XTFPGA_I2S=m
 CONFIG_SND_SOC_WM_HUBS=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
-CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_WM8994=m
+CONFIG_SND_SYNTH_EMUX=m
 
 #
 # USB Host Controller Drivers
 #
+CONFIG_USB_XHCI_HISTB=m
 CONFIG_USB_XHCI_MTK=m
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_MXC=y
@@ -1247,6 +1308,7 @@ CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_EXYNOS=m
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_USB_DWC3_ST=m
+CONFIG_USB_DWC3_QCOM=m
 
 #
 # USB Physical Layer drivers
@@ -1256,6 +1318,7 @@ CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
 CONFIG_USB_MXS_PHY=m
+CONFIG_USB_TEGRA_PHY=y
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -1315,6 +1378,7 @@ CONFIG_RTC_DRV_SUNXI=m
 CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
 CONFIG_RTC_DRV_SIRFSOC=m
 CONFIG_RTC_DRV_ST_LPC=m
 CONFIG_RTC_DRV_MT7622=m
@@ -1323,7 +1387,6 @@ CONFIG_RTC_DRV_MT7622=m
 # DMA Devices
 #
 CONFIG_AXI_DMAC=m
-# CONFIG_DMA_OMAP is not set
 CONFIG_DMA_SUN4I=m
 CONFIG_DMA_SUN6I=m
 # CONFIG_IMX_DMA is not set
@@ -1337,19 +1400,16 @@ CONFIG_NBPFAXI_DMA=m
 # CONFIG_STE_DMA40 is not set
 CONFIG_ST_FDMA=m
 # CONFIG_TEGRA20_APB_DMA is not set
+CONFIG_MTK_HSDMA=m
+# CONFIG_QCOM_BAM_DMA is not set
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_TI_EDMA is not set
-# CONFIG_QCOM_BAM_DMA is not set
-
-#
-# DMABUF options
-#
-# CONFIG_ARM_CHARLCD is not set
+# CONFIG_DMA_OMAP is not set
 
 #
-# Microsoft Hyper-V guest support
+# Xen driver support
 #
-CONFIG_CHROME_PLATFORMS=y
+# CONFIG_MELLANOX_PLATFORM is not set
 
 #
 # Common Clock Framework
@@ -1365,12 +1425,18 @@ CONFIG_CLK_BCM_SR=y
 CONFIG_COMMON_CLK_HI3516CV300=y
 CONFIG_COMMON_CLK_HI3519=y
 CONFIG_COMMON_CLK_HI3660=y
+CONFIG_COMMON_CLK_HI3670=y
 CONFIG_COMMON_CLK_HI3798CV200=y
 CONFIG_COMMON_CLK_HI6220=y
 CONFIG_RESET_HISI=y
 CONFIG_STUB_CLK_HI6220=y
+CONFIG_STUB_CLK_HI3660=y
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_TI_SCI_CLK=m
+
+#
+# Clock driver for MediaTek SoC
+#
 CONFIG_COMMON_CLK_MEDIATEK=y
 CONFIG_COMMON_CLK_MT2701=y
 # CONFIG_COMMON_CLK_MT2701_MMSYS is not set
@@ -1379,6 +1445,8 @@ CONFIG_COMMON_CLK_MT2701=y
 # CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
 # CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
 # CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
+# CONFIG_COMMON_CLK_MT2701_AUDSYS is not set
+# CONFIG_COMMON_CLK_MT2701_G3DSYS is not set
 CONFIG_COMMON_CLK_MT7622=y
 CONFIG_COMMON_CLK_MT7622_ETHSYS=y
 CONFIG_COMMON_CLK_MT7622_HIFSYS=y
@@ -1386,8 +1454,10 @@ CONFIG_COMMON_CLK_MT7622_AUDSYS=y
 CONFIG_COMMON_CLK_MT8135=y
 CONFIG_COMMON_CLK_MT8173=y
 CONFIG_COMMON_CLK_MESON8B=y
+CONFIG_KRAIT_CLOCKS=y
 CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=m
+CONFIG_QCOM_A53PLL=m
 # CONFIG_QCOM_CLK_RPM is not set
 # CONFIG_QCOM_CLK_SMD_RPM is not set
 CONFIG_APQ_GCC_8084=m
@@ -1408,6 +1478,17 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_GCC_8994=m
 CONFIG_MSM_GCC_8996=m
 CONFIG_MSM_MMCC_8996=m
+CONFIG_MSM_GCC_8998=m
+CONFIG_QCS_GCC_404=m
+CONFIG_SDM_CAMCC_845=m
+CONFIG_SDM_GCC_660=m
+CONFIG_SDM_GCC_845=m
+CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SDM_DISPCC_845=m
+CONFIG_SPMI_PMIC_CLKDIV=m
+CONFIG_QCOM_HFPLL=m
+CONFIG_KPSS_XCC=m
+CONFIG_KRAITCC=m
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
 CONFIG_SUNXI_CCU=y
@@ -1433,6 +1514,7 @@ CONFIG_HWSPINLOCK_SIRF=m
 #
 # Clock Source drivers
 #
+CONFIG_OMAP_DM_TIMER=y
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
 CONFIG_ROCKCHIP_TIMER=y
@@ -1456,15 +1538,19 @@ CONFIG_CLKSRC_SAMSUNG_PWM=y
 CONFIG_MTK_TIMER=y
 CONFIG_CLKSRC_IMX_GPT=y
 CONFIG_CLKSRC_ST_LPC=y
+CONFIG_IMX_MBOX=m
 CONFIG_PL320_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_ROCKCHIP_MBOX=y
 CONFIG_STI_MBOX=m
 CONFIG_TI_MESSAGE_MANAGER=m
+# CONFIG_HI3660_MBOX is not set
 CONFIG_HI6220_MBOX=m
 # CONFIG_QCOM_APCS_IPC is not set
+# CONFIG_TEGRA_HSP_MBOX is not set
 CONFIG_BCM_PDC_MBOX=m
+CONFIG_MTK_CMDQ_MBOX=m
 
 #
 # Generic IOMMU Pagetable Support
@@ -1488,9 +1574,13 @@ CONFIG_IMX_REMOTEPROC=m
 CONFIG_OMAP_REMOTEPROC=m
 CONFIG_WKUP_M3_RPROC=m
 CONFIG_KEYSTONE_REMOTEPROC=m
-CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_RPROC_COMMON=m
-CONFIG_QCOM_Q6V5_PIL=m
+CONFIG_QCOM_Q6V5_COMMON=m
+CONFIG_QCOM_Q6V5_ADSP=m
+CONFIG_QCOM_Q6V5_MSS=m
+CONFIG_QCOM_Q6V5_PAS=m
+CONFIG_QCOM_Q6V5_WCSS=m
+# CONFIG_QCOM_SYSMON is not set
 CONFIG_QCOM_WCNSS_PIL=m
 CONFIG_ST_REMOTEPROC=m
 CONFIG_ST_SLIM_REMOTEPROC=m
@@ -1506,28 +1596,38 @@ CONFIG_RPMSG_QCOM_SMD=m
 #
 CONFIG_SOC_BRCMSTB=y
 CONFIG_BRCMSTB_PM=y
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
 CONFIG_FSL_GUTS=y
 
 #
 # MediaTek SoC drivers
 #
-# CONFIG_MTK_INFRACFG is not set
+CONFIG_MTK_INFRACFG=y
 # CONFIG_MTK_PMIC_WRAP is not set
 # CONFIG_MTK_SCPSYS is not set
 
 #
 # Qualcomm SoC drivers
 #
+# CONFIG_QCOM_COMMAND_DB is not set
+# CONFIG_QCOM_GENI_SE is not set
 # CONFIG_QCOM_GLINK_SSR is not set
 CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_LLCC=m
+# CONFIG_QCOM_SDM845_LLCC is not set
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_PM=y
+CONFIG_QCOM_QMI_HELPERS=m
 # CONFIG_QCOM_RMTFS_MEM is not set
 CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMP2P is not set
 # CONFIG_QCOM_SMSM is not set
 # CONFIG_QCOM_WCNSS_CTRL is not set
+# CONFIG_QCOM_APR is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
@@ -1544,6 +1644,7 @@ CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TEGRA_PMC=y
 # CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set
 CONFIG_KEYSTONE_NAVIGATOR_DMA=m
+CONFIG_AMX3_PM=m
 CONFIG_WKUP_M3_IPC=m
 CONFIG_TI_SCI_PM_DOMAINS=m
 CONFIG_UX500_SOC_ID=y
@@ -1572,7 +1673,7 @@ CONFIG_EXTCON_QCOM_SPMI_MISC=m
 # CONFIG_TI_EMIF is not set
 CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
-CONFIG_TEGRA20_MC=y
+CONFIG_TI_EMIF_SRAM=m
 CONFIG_MTK_SMI=y
 CONFIG_SAMSUNG_MC=y
 CONFIG_EXYNOS_SROM=y
@@ -1626,8 +1727,11 @@ CONFIG_OMAP_IRQCHIP=y
 CONFIG_ST_IRQCHIP=y
 CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
+# CONFIG_QCOM_PDC is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
+CONFIG_RESET_QCOM_AOSS=y
+CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SCI=m
@@ -1648,17 +1752,21 @@ CONFIG_PHY_NS2_PCIE=y
 CONFIG_PHY_NS2_USB_DRD=y
 CONFIG_PHY_BRCM_SATA=y
 CONFIG_PHY_BRCM_USB=m
+CONFIG_PHY_BCM_SR_PCIE=m
 CONFIG_PHY_HIX5HD2_SATA=m
 CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_XSPHY=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
 CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
@@ -1692,7 +1800,7 @@ CONFIG_NVMEM_VF610_OCOTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
 
 #
-# FSI support
+# HW tracing support
 #
 # CONFIG_TEE is not set
 
@@ -1703,56 +1811,18 @@ CONFIG_NVMEM_SNVS_LPGPR=m
 # CONFIG_MUX_GPIO is not set
 # CONFIG_MUX_MMIO is not set
 
-#
-# Firmware Drivers
-#
-CONFIG_QCOM_SCM=y
-CONFIG_QCOM_SCM_32=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-CONFIG_TI_SCI_PROTOCOL=m
-CONFIG_BCM47XX_NVRAM=y
-# CONFIG_BCM47XX_SPROM is not set
-
-#
-# Tegra firmware driver
-#
-# CONFIG_TEGRA_IVC is not set
-
 #
 # Pseudo filesystems
 #
 CONFIG_PROC_VMCORE=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_HIGHMEM is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-
-#
-# Runtime Testing
-#
-# CONFIG_ARM_PTDUMP is not set
-CONFIG_ARM_UNWIND=y
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_IMX_UART_PORT=1
-CONFIG_DEBUG_VF_UART_PORT=1
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
-# CONFIG_DEBUG_UART_8250 is not set
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 
 #
 # Random Number Generation
 #
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
 CONFIG_CRYPTO_DEV_FSL_CAAM=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
@@ -1762,8 +1832,8 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
-# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
 CONFIG_CRYPTO_DEV_OMAP=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
@@ -1775,6 +1845,7 @@ CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_UX500 is not set
 CONFIG_CRYPTO_DEV_MXS_DCP=m
 CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
@@ -1782,24 +1853,27 @@ CONFIG_CRYPTO_DEV_MEDIATEK=m
 CONFIG_CRYPTO_DEV_BCM_SPU=m
 
 #
-# Certificates for signature checking
+# Library routines
 #
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-CONFIG_CRYPTO_SHA1_ARM_CE=m
-CONFIG_CRYPTO_SHA2_ARM_CE=m
-CONFIG_CRYPTO_SHA256_ARM=m
-CONFIG_CRYPTO_SHA512_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-CONFIG_CRYPTO_AES_ARM_BS=m
-CONFIG_CRYPTO_AES_ARM_CE=m
-CONFIG_CRYPTO_GHASH_ARM_CE=m
-CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
-CONFIG_CRYPTO_CRC32_ARM_CE=m
+CONFIG_STMP_DEVICE=y
 
 #
-# Library routines
+# Memory Debugging
 #
-CONFIG_STMP_DEVICE=y
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+
+#
+# RCU Debugging
+#
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_ARM_PTDUMP_CORE=y
+# CONFIG_ARM_PTDUMP_DEBUGFS is not set
+CONFIG_DEBUG_WX=y
+CONFIG_UNWINDER_ARM=y
+CONFIG_ARM_UNWIND=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_IMX_UART_PORT=1
+CONFIG_DEBUG_VF_UART_PORT=1
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"