X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=kernel%2Fconfig-arm32-generic;h=e5233e9899a4ae12369dbb94acf464ac2c839305;hb=cd59c044c06186746eee64a3063e225ba26321e7;hp=e2548f9a7c16f29c6e077d1312524156d72041d5;hpb=65c2debaaf3d6647009b503eb705a615852b2b55;p=ipfire-3.x.git

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index e2548f9a7..e5233e989 100644
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -1,13 +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_ZONE_DMA=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
 
 #
 # General setup
@@ -22,32 +12,27 @@ CONFIG_KERNEL_XZ=y
 # RCU Subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
 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
-CONFIG_ARCH_HAS_PHYS_TO_DMA=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
@@ -154,12 +139,12 @@ 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
@@ -334,7 +319,6 @@ CONFIG_ARM_ERRATA_798181=y
 #
 # 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
@@ -392,9 +376,6 @@ CONFIG_HIGHMEM=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_BOUNCE=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -449,16 +430,68 @@ 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
+
+#
+# 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
@@ -484,6 +517,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
@@ -504,6 +538,7 @@ CONFIG_SRAM_EXEC=y
 # SCSI Transports
 #
 CONFIG_SCSI_UFS_QCOM=m
+# CONFIG_SCSI_UFS_HISI is not set
 CONFIG_SCSI_NSP32=m
 
 #
@@ -653,7 +688,6 @@ 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_HW_RANDOM_EXYNOS=m
@@ -718,6 +752,7 @@ CONFIG_PINCTRL_ZYNQ=y
 CONFIG_PINCTRL_IPROC_GPIO=y
 CONFIG_PINCTRL_NS2_MUX=y
 CONFIG_PINCTRL_BERLIN=y
+CONFIG_PINCTRL_AS370=y
 CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX6Q=y
@@ -819,6 +854,7 @@ CONFIG_GPIO_TS4900=m
 CONFIG_POWER_RESET_BRCMKONA=y
 CONFIG_POWER_RESET_HISI=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
@@ -1032,6 +1068,7 @@ 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
@@ -1158,6 +1195,10 @@ 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
@@ -1433,6 +1474,7 @@ CONFIG_MSM_MMCC_8996=m
 CONFIG_MSM_GCC_8998=m
 CONFIG_SDM_GCC_845=m
 CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SDM_DISPCC_845=m
 CONFIG_SPMI_PMIC_CLKDIV=m
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
@@ -1483,6 +1525,7 @@ 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
@@ -1494,6 +1537,7 @@ 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
@@ -1519,7 +1563,9 @@ 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_WCSS=m
 # CONFIG_QCOM_SYSMON is not set
 CONFIG_QCOM_WCNSS_PIL=m
 CONFIG_ST_REMOTEPROC=m
@@ -1536,12 +1582,16 @@ 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
 
@@ -1552,6 +1602,8 @@ CONFIG_FSL_GUTS=y
 # 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_RMTFS_MEM is not set
@@ -1663,6 +1715,7 @@ CONFIG_IRQ_CROSSBAR=y
 # CONFIG_QCOM_PDC is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
+CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SCI=m
@@ -1683,6 +1736,7 @@ 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
@@ -1739,47 +1793,12 @@ 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
 # CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 
-#
-# Memory Debugging
-#
-# 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_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"
-
 #
 # Random Number Generation
 #
@@ -1808,6 +1827,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
@@ -1815,23 +1835,26 @@ 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_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_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"