kernel: update to 5.0

[ipfire-3.x.git] / kernel / config-arm32-generic

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 3ac848afa1ca48e45a4b00c5d58df308d97639bf..28be4dccf287a8030ffb5201192916964d82c335 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -21,7 +21,6 @@ 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
@@ -114,7 +113,6 @@ CONFIG_PLAT_SAMSUNG=y
 #
 # Power management
 #
-# CONFIG_SAMSUNG_PM_CHECK is not set
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HISI=y
 
@@ -145,6 +143,7 @@ CONFIG_SOC_IMX6SX=y
 # Cortex-A/Cortex-M asymmetric multiprocessing platforms
 #
 # CONFIG_SOC_IMX7D is not set
+# CONFIG_SOC_IMX7ULP is not set
 CONFIG_SOC_VF610=y
 CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
 # CONFIG_VF_USE_PIT_TIMER is not set
@@ -214,6 +213,7 @@ CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_MSM8960 is not set
 # CONFIG_ARCH_MSM8974 is not set
 # CONFIG_ARCH_MDM9615 is not set
+# CONFIG_ARCH_RDA is not set
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_S5PV210 is not set
@@ -307,42 +307,13 @@ 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
-
-#
-# Cadence PCIe controllers support
-#
-# CONFIG_PCI_FTPCI100 is not set
-CONFIG_PCI_TEGRA=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=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
-#
-# CONFIG_PCCARD is not set
+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
 
 #
 # Kernel Features
@@ -362,23 +333,22 @@ 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_PATCH_IDIV=y
 CONFIG_AEABI=y
+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_ARM_MODULE_PLTS=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_STACKPROTECTOR_PER_TASK=y
 
 #
 # Boot options
@@ -400,26 +370,27 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU frequency scaling drivers
 #
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
-# CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
-CONFIG_ARM_BRCMSTB_AVS_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
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
 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
 
 #
@@ -444,6 +415,7 @@ CONFIG_QCOM_SCM_32=y
 CONFIG_TI_SCI_PROTOCOL=m
 CONFIG_BCM47XX_NVRAM=y
 # CONFIG_BCM47XX_SPROM is not set
+# CONFIG_IMX_SCU is not set
 
 #
 # Tegra firmware driver
@@ -478,6 +450,7 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 #
 # GCOV-based kernel profiling
 #
+CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
 CONFIG_LBDAF=y
 
 #
@@ -503,10 +476,36 @@ CONFIG_BOUNCE=y
 #
 CONFIG_TEGRA_AHB=y
 
+#
+# Cadence PCIe controllers support
+#
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_TEGRA=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=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
+
 #
 # Firmware loader
 #
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+CONFIG_REGMAP_SPMI=m
 
 #
 # Bus devices
@@ -590,11 +589,11 @@ CONFIG_GIANFAR=m
 CONFIG_PXA168_ETH=m
 CONFIG_NET_VENDOR_MEDIATEK=y
 CONFIG_NET_MEDIATEK_SOC=m
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
 CONFIG_SMC911X=m
 CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MEDIATEK=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_STI=m
 CONFIG_DWMAC_SUNXI=m
@@ -640,7 +639,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
@@ -658,7 +656,7 @@ CONFIG_SERIO_SUN4I_PS2=m
 #
 # Character devices
 #
-CONFIG_DEVKMEM=y
+# CONFIG_DEVKMEM is not set
 
 #
 # Serial drivers
@@ -750,6 +748,7 @@ 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_AS370=y
@@ -779,8 +778,10 @@ 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
@@ -814,7 +815,9 @@ CONFIG_PINCTRL_TI_IODELAY=y
 #
 CONFIG_EINT_MTK=y
 CONFIG_PINCTRL_MTK=y
+CONFIG_PINCTRL_MTK_MOORE=y
 # CONFIG_PINCTRL_MT2701 is not set
+CONFIG_PINCTRL_MT7623=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT6397=y
@@ -868,10 +871,6 @@ CONFIG_POWER_RESET_KEYSTONE=y
 CONFIG_IMX_THERMAL=m
 CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_DB8500_THERMAL=y
-
-#
-# ACPI INT340X thermal drivers
-#
 CONFIG_MTK_THERMAL=m
 
 #
@@ -906,6 +905,7 @@ CONFIG_TEGRA_SOCTHERM=m
 # Qualcomm thermal drivers
 #
 CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_SPMI_TEMP_ALARM=m
 
 #
 # Watchdog Device Drivers
@@ -923,6 +923,7 @@ CONFIG_TEGRA_WATCHDOG=m
 CONFIG_QCOM_WDT=m
 CONFIG_MEDIATEK_WATCHDOG=m
 CONFIG_ATLAS7_WATCHDOG=m
+CONFIG_PM8916_WATCHDOG=m
 CONFIG_BCM47XX_WDT=m
 CONFIG_BCM7038_WDT=m
 
@@ -991,8 +992,10 @@ CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_QCOM_CAMSS is not set
 # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
 # CONFIG_VIDEO_AM437X_VPFE is not set
+# CONFIG_VIDEO_SUN6I_CSI is not set
 # CONFIG_VIDEO_TI_CAL is not set
 # CONFIG_VIDEO_CODA 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
@@ -1059,6 +1062,7 @@ 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
@@ -1119,6 +1123,7 @@ CONFIG_DRM_TEGRA=m
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_DP=m
+CONFIG_DRM_DW_MIPI_DSI=m
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
 CONFIG_DRM_V3D=m
@@ -1237,8 +1242,10 @@ 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_XILINX_I2S=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
 
 #
@@ -1395,6 +1402,7 @@ CONFIG_NBPFAXI_DMA=m
 CONFIG_ST_FDMA=m
 # CONFIG_TEGRA20_APB_DMA is not set
 CONFIG_MTK_HSDMA=m
+CONFIG_MTK_CQDMA=m
 # CONFIG_QCOM_BAM_DMA is not set
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_TI_EDMA is not set
@@ -1403,7 +1411,6 @@ CONFIG_MTK_HSDMA=m
 #
 # Xen driver support
 #
-CONFIG_CHROME_PLATFORMS=y
 # CONFIG_MELLANOX_PLATFORM is not set
 
 #
@@ -1420,11 +1427,13 @@ 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_MXC_CLK=y
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_TI_SCI_CLK=m
 
@@ -1445,9 +1454,13 @@ CONFIG_COMMON_CLK_MT7622=y
 CONFIG_COMMON_CLK_MT7622_ETHSYS=y
 CONFIG_COMMON_CLK_MT7622_HIFSYS=y
 CONFIG_COMMON_CLK_MT7622_AUDSYS=y
+CONFIG_COMMON_CLK_MT7629=y
+CONFIG_COMMON_CLK_MT7629_ETHSYS=y
+CONFIG_COMMON_CLK_MT7629_HIFSYS=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
@@ -1472,10 +1485,18 @@ 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_GPUCC_845=m
 CONFIG_SDM_VIDEOCC_845=m
 CONFIG_SDM_DISPCC_845=m
+CONFIG_SDM_LPASSCC_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
@@ -1516,7 +1537,6 @@ CONFIG_CLKSRC_DBX500_PRCMU=y
 CONFIG_ATLAS7_TIMER=y
 CONFIG_PRIMA2_TIMER=y
 CONFIG_KEYSTONE_TIMER=y
-CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
@@ -1561,10 +1581,11 @@ 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_COMMON=m
-CONFIG_QCOM_Q6V5_PIL=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
@@ -1591,6 +1612,7 @@ CONFIG_FSL_GUTS=y
 #
 # MediaTek SoC drivers
 #
+CONFIG_MTK_CMDQ=m
 CONFIG_MTK_INFRACFG=y
 # CONFIG_MTK_PMIC_WRAP is not set
 # CONFIG_MTK_SCPSYS is not set
@@ -1606,6 +1628,7 @@ 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
@@ -1660,9 +1683,11 @@ CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_TI_EMIF_SRAM=m
 CONFIG_MTK_SMI=y
+CONFIG_PL353_SMC=y
 CONFIG_SAMSUNG_MC=y
 CONFIG_EXYNOS_SROM=y
 CONFIG_TEGRA_MC=y
+CONFIG_TEGRA20_EMC=y
 CONFIG_TEGRA124_EMC=y
 
 #
@@ -1713,9 +1738,11 @@ CONFIG_ST_IRQCHIP=y
 CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
 # CONFIG_QCOM_PDC is not set
+CONFIG_IMX_IRQSTEER=y
 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
@@ -1747,8 +1774,10 @@ 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
@@ -1767,6 +1796,7 @@ CONFIG_PHY_TEGRA_XUSB=m
 CONFIG_PHY_DM816X_USB=m
 CONFIG_OMAP_CONTROL_PHY=m
 CONFIG_TWL4030_USB=m
+CONFIG_PHY_TI_GMII_SEL=m
 
 #
 # Android
@@ -1802,7 +1832,9 @@ CONFIG_PROC_VMCORE=y
 #
 # Random Number Generation
 #
+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
@@ -1812,8 +1844,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
@@ -1849,10 +1881,10 @@ 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"