diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-13 19:07:24 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-13 19:07:24 +0200 |
| commit | d94dc15a696d58ae0ef9b7ee20fe6379529b4a02 (patch) | |
| tree | 1e89d57660ea621838e96290f5b9b38b9870a191 /kernel-armv7hl.config | |
| parent | ea1219ace9699761c3884cac033cea5a125c7731 (diff) | |
| parent | 735223bf90b9f8d681ab82e31fda2308a07a1004 (diff) | |
| download | kernel-d94dc15a696d58ae0ef9b7ee20fe6379529b4a02.tar.gz kernel-d94dc15a696d58ae0ef9b7ee20fe6379529b4a02.tar.xz kernel-d94dc15a696d58ae0ef9b7ee20fe6379529b4a02.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-0.rc0.git5.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc0.git5.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc0.git5.1.vanilla.knurd.1.fc29kernel-5.2.0-0.rc0.git5.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 498076e09..03e45e4a9 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -283,6 +283,7 @@ CONFIG_ARCH_ZYNQ=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PA_BITS_48=y # CONFIG_ARM64_VA_BITS_39 is not set +CONFIG_ARMADA_37XX_RWTM_MBOX=m # CONFIG_ARMADA_37XX_WATCHDOG is not set CONFIG_ARMADA_THERMAL=m CONFIG_ARM_AMBA=y @@ -353,6 +354,7 @@ CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_ARM_SCPI_CPUFREQ=m CONFIG_ARM_SCPI_POWER_DOMAIN=m CONFIG_ARM_SCPI_PROTOCOL=m +CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y CONFIG_ARM_SMMU=y CONFIG_ARM_SP805_WATCHDOG=m CONFIG_ARM_SPE_PMU=m @@ -1061,11 +1063,13 @@ CONFIG_CRC_T10DIF=y CONFIG_CROS_EC_I2C=m # CONFIG_CROS_EC_LIGHTBAR is not set CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_EC_RPMSG=m CONFIG_CROS_EC_SPI=m CONFIG_CROS_EC_SYSFS=m CONFIG_CROS_EC_VBC=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CROS_USBPD_LOGGER=m CONFIG_CRYPTO_842=y CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m @@ -1818,6 +1822,7 @@ CONFIG_FB_MXS=m # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set +# CONFIG_FB_PRE_INIT_FB is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_RIVA is not set # CONFIG_FB_S1D13XXX is not set @@ -2467,6 +2472,7 @@ CONFIG_IMX_MBOX=m CONFIG_IMX_REMOTEPROC=m # CONFIG_IMX_SCU_PD is not set CONFIG_IMX_SCU=y +CONFIG_IMX_SC_WDT=m CONFIG_IMX_SDMA=m CONFIG_IMX_THERMAL=m CONFIG_IMX_WEIM=y @@ -3009,7 +3015,6 @@ CONFIG_L2TP_V3=y # CONFIG_LAPB is not set CONFIG_LATENCYTOP=y CONFIG_LATTICE_ECP3_CONFIG=m -CONFIG_LBDAF=y CONFIG_LCD_AMS369FG06=m CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_HX8357=m @@ -3676,13 +3681,18 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_NAND_BRCMNAND is not set CONFIG_MTD_NAND_CAFE=m +# CONFIG_MTD_NAND_CS553X is not set # CONFIG_MTD_NAND_DENALI_DT is not set # CONFIG_MTD_NAND_DENALI_PCI is not set # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_NAND_ECC_SMC=y +# CONFIG_MTD_NAND_ECC_SW_BCH is not set +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set +# CONFIG_MTD_NAND_FSL_IFC is not set CONFIG_MTD_NAND_GPIO=m CONFIG_MTD_NAND_GPMI_NAND=m +# CONFIG_MTD_NAND_HISI504 is not set CONFIG_MTD_NAND=m CONFIG_MTD_NAND_MARVELL=m # CONFIG_MTD_NAND_MESON is not set @@ -3709,6 +3719,7 @@ CONFIG_MTD_PHYSMAP=m # CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PMC551 is not set # CONFIG_MTD_RAM is not set +CONFIG_MTD_RAW_NAND=m # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_SHARPSL_PARTS is not set @@ -4782,6 +4793,7 @@ CONFIG_PWM_CROS_EC=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_IMX1 is not set CONFIG_PWM_IMX27=m +CONFIG_PWM_IMX_TPM=m CONFIG_PWM_MESON=m CONFIG_PWM_OMAP_DMTIMER=m # CONFIG_PWM_PCA9685 is not set |