diff options
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-armv7 | 16 | ||||
| -rw-r--r-- | config-armv7-generic | 10 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 27 insertions, 4 deletions
diff --git a/config-arm-generic b/config-arm-generic index 824602485..12c9168da 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -311,10 +311,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-armv7 b/config-armv7 index b3a496c46..b39acc274 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 @@ -384,6 +390,16 @@ 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 diff --git a/config-armv7-generic b/config-armv7-generic index 63efd958e..9079e0a06 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -199,14 +199,18 @@ CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m CONFIG_TOUCHSCREEN_SUN4I=m CONFIG_MFD_AXP20X=y -CONFIG_REGULATOR_AXP20X=m CONFIG_AXP288_FUEL_GAUGE=m +CONFIG_AXP288_ADC=m +CONFIG_EXTCON_AXP288=m +CONFIG_INPUT_AXP20X_PEK=m +CONFIG_REGULATOR_AXP20X=m +CONFIG_AXP288_CHARGER=m +CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m CONFIG_IR_SUNXI=m CONFIG_MDIO_SUN4I=m CONFIG_DWMAC_SUNXI=m CONFIG_SUN4I_EMAC=m CONFIG_RTC_DRV_SUN6I=m -CONFIG_AXP288_ADC=m CONFIG_MTD_NAND_SUNXI=m CONFIG_SERIO_SUN4I_PS2=m CONFIG_KEYBOARD_SUN4I_LRADC=m @@ -899,7 +903,6 @@ CONFIG_R8188EU=m # CONFIG_PMIC_DA903X is not set # CONFIG_PMIC_ADP5520 is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set -# CONFIG_INPUT_AXP20X_PEK is not set # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_INPUT_TPS65218_PWRBUTTON is not set # CONFIG_CLK_QORIQ is not set @@ -907,7 +910,6 @@ CONFIG_R8188EU=m # CONFIG_QCOM_SPMI_TEMP_ALARM is not set # CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_TAS571X is not set -# CONFIG_EXTCON_AXP288 is not set # Debug options. We need to deal with them at some point like x86 # CONFIG_DEBUG_USER is not set diff --git a/kernel.spec b/kernel.spec index 2f4e2d949..4a6a5f8a7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2230,6 +2230,9 @@ fi # # %changelog +* Wed Sep 9 2015 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARMv7/aarch64 config updates + * Tue Sep 08 2015 Josh Boyer <jwboyer@fedoraproject.org> - Fix oops in blk layer (rhbz 1237136) |