diff options
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-arm64 | 6 | ||||
| -rw-r--r-- | config-armv7 | 17 | ||||
| -rw-r--r-- | config-armv7-generic | 2 | ||||
| -rw-r--r-- | config-generic | 3 | ||||
| -rw-r--r-- | kernel.spec | 3 |
6 files changed, 27 insertions, 6 deletions
diff --git a/config-arm-generic b/config-arm-generic index af53be4a2..547ff7f7b 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -316,10 +316,12 @@ CONFIG_VFIO_AMBA=m # CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XIRCOM is not set +# CONFIG_TLAN is not set # scsi # CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_BLK_DEV_DAC960 is not set # CONFIG_SCSI_3W_SAS is not set # CONFIG_SCSI_PM8001 is not set # CONFIG_SCSI_IPS is not set diff --git a/config-arm64 b/config-arm64 index 5773c1cb5..fba785470 100644 --- a/config-arm64 +++ b/config-arm64 @@ -39,7 +39,6 @@ CONFIG_ARM_SMMU_V3=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARM64_64K_PAGES=y -# CONFIG_COMPAT is not set CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y @@ -146,6 +145,9 @@ CONFIG_AMD_XGBE_PHY=m CONFIG_POWER_RESET_HISI=y CONFIG_HISI_THERMAL=m +# ThunderX +# CONFIG_MDIO_OCTEON is not set + CONFIG_NET_VENDOR_MELLANOX=y CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y @@ -164,8 +166,6 @@ CONFIG_BTT=y CONFIG_ND_BTT=m CONFIG_ND_BLK=m -CONFIG_MDIO_OCTEON=m - # CONFIG_SND_SOC is not set # CONFIG_PMIC_OPREGION is not set diff --git a/config-armv7 b/config-armv7 index 2f9e02ba7..e945d88b0 100644 --- a/config-armv7 +++ b/config-armv7 @@ -65,6 +65,9 @@ CONFIG_TWL4030_MADC=m CONFIG_TWL4030_POWER=y CONFIG_TWL4030_WATCHDOG=m CONFIG_BATTERY_TWL4030_MADC=m +CONFIG_BATTERY_BQ27x00=m +CONFIG_BATTERY_BQ27X00_I2C=y +CONFIG_BATTERY_BQ27X00_PLATFORM=y CONFIG_OMAP_USB2=m CONFIG_OMAP_CONTROL_PHY=m CONFIG_TI_PIPE3=m @@ -264,6 +267,9 @@ CONFIG_VIDEO_AM437X_VPFE=m CONFIG_UIO_PRUSS=m CONFIG_WKUP_M3_RPROC=m +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m + # QCom CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y @@ -390,11 +396,20 @@ CONFIG_IMX_WEIM=y CONFIG_IMX2_WDT=m CONFIG_HW_RANDOM_MXC_RNGA=m CONFIG_CRYPTO_DEV_SAHARA=m +CONFIG_CRYPTO_DEV_FSL_CAAM=m +CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m +CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3 +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8 +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192 +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m +# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set CONFIG_RTC_DRV_SNVS=m CONFIG_FB_MXS=m # CONFIG_FB_MX3 is not set # CONFIG_FB_IMX is not set -# CONFIG_CRYPTO_DEV_FSL_CAAM is not set CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_FSL_ASOC_CARD=m diff --git a/config-armv7-generic b/config-armv7-generic index 73be11503..1560448fc 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -183,7 +183,7 @@ CONFIG_MACH_SUN7I=y CONFIG_MACH_SUN8I=y # CONFIG_MACH_SUN9I is not set CONFIG_SUNXI_SRAM=y -# CONFIG_DMA_SUN4I is not set +CONFIG_DMA_SUN4I=m CONFIG_DMA_SUN6I=m CONFIG_SUNXI_WATCHDOG=m CONFIG_NET_VENDOR_ALLWINNER=y diff --git a/config-generic b/config-generic index 5e8c88c2f..ff9f9b918 100644 --- a/config-generic +++ b/config-generic @@ -1916,10 +1916,10 @@ CONFIG_IEEE802154_SOCKET=m CONFIG_IEEE802154_6LOWPAN=m CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_ATUSB=m CONFIG_IEEE802154_CC2520=m # CONFIG_IEEE802154_AT86RF230 is not set # CONFIG_IEEE802154_MRF24J40 is not set -# CONFIG_IEEE802154_ATUSB is not set CONFIG_MAC802154=m CONFIG_NET_MPLS_GSO=m @@ -2130,6 +2130,7 @@ CONFIG_BT_HCIUART_LL=y CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m +CONFIG_BT_QCA=m CONFIG_BT_WILINK=m # diff --git a/kernel.spec b/kernel.spec index 905545209..043af017a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2046,6 +2046,9 @@ fi # # %changelog +* Tue Sep 8 2015 Peter Robinson <pbrobinson@fedoraproject.org> +- Config updates for ARMv7/aarch64 + * Tue Sep 08 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.0-0.rc0.git9.1 - Linux v4.2-9861-g4e4adb2f4628 |