diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2016-03-19 08:57:54 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2016-03-19 08:57:54 +0000 |
| commit | 61a9f1c04f2f994e5566b1a8c8da6cf2e276f488 (patch) | |
| tree | 0576946877de17381dc2fc3a96f26ea3bc0b614e | |
| parent | 96bb3e4edb65803e71bf70b793b779c6c0e1fbab (diff) | |
| download | kernel-61a9f1c04f2f994e5566b1a8c8da6cf2e276f488.tar.gz kernel-61a9f1c04f2f994e5566b1a8c8da6cf2e276f488.tar.xz kernel-61a9f1c04f2f994e5566b1a8c8da6cf2e276f488.zip | |
Minor ARM cleanups, Drop ARM_PATCH_IDIV work around
| -rw-r--r-- | config-armv7 | 42 | ||||
| -rw-r--r-- | config-armv7-generic | 6 | ||||
| -rw-r--r-- | kernel.spec | 4 |
3 files changed, 8 insertions, 44 deletions
diff --git a/config-armv7 b/config-armv7 index 0cce9bc04..1a040d692 100644 --- a/config-armv7 +++ b/config-armv7 @@ -8,7 +8,6 @@ CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_ARCH_QCOM=y CONFIG_ARCH_TEGRA=y -CONFIG_ARCH_U8500=y CONFIG_ARCH_ZYNQ=y # These are supported in the LPAE kernel @@ -259,6 +258,7 @@ CONFIG_INPUT_TPS65218_PWRBUTTON=m CONFIG_VIDEO_AM437X_VPFE=m CONFIG_UIO_PRUSS=m CONFIG_WKUP_M3_RPROC=m +CONFIG_WKUP_M3_IPC=m # Builtin needed for BBone White CONFIG_MFD_TPS65217=y @@ -538,46 +538,6 @@ CONFIG_AK8975=m CONFIG_CM36651=m CONFIG_KEYBOARD_SAMSUNG=m -# ST Ericsson -CONFIG_MACH_HREFV60=y -CONFIG_MACH_SNOWBALL=y - -CONFIG_ABX500_CORE=y -# CONFIG_ARM_U8500_CPUIDLE is not set -CONFIG_UX500_DEBUG_UART=2 -CONFIG_AB8500_CORE=y -CONFIG_STE_DMA40=y -CONFIG_HSEM_U8500=m -CONFIG_PINCTRL_ABX500=y -CONFIG_PINCTRL_AB8500=y -CONFIG_I2C_NOMADIK=m -CONFIG_KEYBOARD_NOMADIK=m -CONFIG_DB8500_CPUFREQ_COOLING=m -CONFIG_DB8500_THERMAL=y -CONFIG_UX500_WATCHDOG=m -CONFIG_AHCI_ST=m -CONFIG_INPUT_AB8500_PONKEY=m -CONFIG_REGULATOR_AB8500=y -CONFIG_AB8500_USB=m -CONFIG_USB_MUSB_UX500=m -# CONFIG_USB_UX500_DMA is not set -CONFIG_RTC_DRV_AB8500=m -CONFIG_PWM_AB8500=m -CONFIG_SND_SOC_UX500=m -CONFIG_SND_SOC_UX500_PLAT_DMA=m -CONFIG_SND_SOC_UX500_MACH_MOP500=m -CONFIG_CLKSRC_DBX500_PRCMU=y -CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y -CONFIG_CRYPTO_DEV_UX500=m -CONFIG_CRYPTO_DEV_UX500_CRYP=m -CONFIG_CRYPTO_DEV_UX500_HASH=m -CONFIG_SENSORS_LIS3_I2C=m -CONFIG_AB8500_BM=y -CONFIG_AB8500_GPADC=y -CONFIG_SENSORS_AB8500=m -CONFIG_STE_MODEM_RPROC=m -CONFIG_STIH415_RESET=y - # Allwinner CONFIG_MACH_SUN4I=y CONFIG_MACH_SUN5I=y diff --git a/config-armv7-generic b/config-armv7-generic index acd645123..bb407e5f3 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -19,8 +19,7 @@ CONFIG_ARM_UNWIND=y CONFIG_ARM_THUMB=y CONFIG_ARM_THUMBEE=y CONFIG_ARM_ASM_UNIFIED=y -# see rhbz 1303147 -# CONFIG_ARM_PATCH_IDIV is not set +CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_CPU_TOPOLOGY=y CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_SWP_EMULATE=y @@ -245,7 +244,8 @@ CONFIG_SPI_BCM2835AUX=m CONFIG_BCM2835_WDT=m CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_DRM_VC4=m -CONFIG_RASPBERRYPI_FIRMWARE=m +CONFIG_RASPBERRYPI_FIRMWARE=y +CONFIG_RASPBERRYPI_POWER=y # Exynos CONFIG_ARCH_EXYNOS3=y diff --git a/kernel.spec b/kernel.spec index 4acf90888..62286e9ad 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2163,6 +2163,10 @@ fi # # %changelog +* Sat Mar 19 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM cleanups +- Drop ARM_PATCH_IDIV work around + * Fri Mar 18 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git11.1 - Linux v4.5-6229-gf7813ad5cbfd - ipmi, mfd, sound merges |