Just some small cleanups and updates for ARM* and Power.
Cheers, Pete
--- fedora/configs/config-arm-generic | 8 +++++++- fedora/configs/config-arm64 | 2 -- fedora/configs/config-armv7-generic | 7 +------ fedora/kernel.spec.template | 3 +++ 4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/fedora/configs/config-arm-generic b/fedora/configs/config-arm-generic index 6730625..d229c6b 100644 --- a/fedora/configs/config-arm-generic +++ b/fedora/configs/config-arm-generic @@ -42,7 +42,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
# ARM AMBA generic HW CONFIG_ARM_AMBA=y -# CONFIG_TEGRA_AHB is not set CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_CCI=y CONFIG_ARM_CCN=y @@ -61,6 +60,10 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIO_AMBAKMI=y CONFIG_FB_ARMCLCD=y +CONFIG_RTC_DRV_PL031=y +CONFIG_PL330_DMA=m +CONFIG_GPIO_PL061=y +CONFIG_USB_ISP1760=m
# ARM VExpress CONFIG_ARCH_VEXPRESS=y @@ -78,6 +81,9 @@ CONFIG_CLKSRC_VERSATILE=y CONFIG_POWER_RESET_VERSATILE=y # CONFIG_ARM_CHARLCD is not set
+# Tegra +# CONFIG_TEGRA_AHB is not set + # Power management / thermal / cpu scaling # CONFIG_ARM_CPUIDLE is not set # CONFIG_ARM_DT_BL_CPUFREQ is not set diff --git a/fedora/configs/config-arm64 b/fedora/configs/config-arm64 index 3e6e1e5..929fc25 100644 --- a/fedora/configs/config-arm64 +++ b/fedora/configs/config-arm64 @@ -27,9 +27,7 @@ CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_832075=y
# AMBA / VExpress -# CONFIG_PL330_DMA is not set # CONFIG_RTC_DRV_PL030 is not set -CONFIG_RTC_DRV_PL031=y # CONFIG_SERIAL_AMBA_PL010 is not set # CONFIG_AMBA_PL08X is not set CONFIG_ARM_SMMU_V3=y diff --git a/fedora/configs/config-armv7-generic b/fedora/configs/config-armv7-generic index 5a24a4b..503ccae 100644 --- a/fedora/configs/config-armv7-generic +++ b/fedora/configs/config-armv7-generic @@ -161,14 +161,8 @@ CONFIG_SERIAL_AMBA_PL010=y CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_RTC_DRV_PL030=y -CONFIG_RTC_DRV_PL031=y - -CONFIG_PL330_DMA=m CONFIG_AMBA_PL08X=y -CONFIG_GPIO_PL061=y -CONFIG_PL320_MBOX=y CONFIG_SND_ARMAACI=m -CONFIG_USB_ISP1760=m
CONFIG_EDAC=y
@@ -178,6 +172,7 @@ CONFIG_EDAC_HIGHBANK_L2=m CONFIG_SATA_HIGHBANK=m CONFIG_ARM_HIGHBANK_CPUFREQ=m # CONFIG_ARM_HIGHBANK_CPUIDLE is not set +CONFIG_PL320_MBOX=y CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
# AllWinner diff --git a/fedora/kernel.spec.template b/fedora/kernel.spec.template index fc0a4a8..01feed5 100644 --- a/fedora/kernel.spec.template +++ b/fedora/kernel.spec.template @@ -1922,6 +1922,9 @@ fi # %changelog %%CHANGELOG%% +* Thu Jul 2 2015 Peter Robinson pbrobinson@fedoraproject.org +- Move aarch64 relevant AMBA config options to arm-generic + * Wed Jul 01 2015 Josh Boyer jwboyer@fedoraproject.org - 4.2.0-0.rc0.git4.1 - Linux v4.1-11549-g05a8256c586a
--- fedora/configs/config-powerpc64 | 1 + fedora/configs/config-powerpc64-generic | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/fedora/configs/config-powerpc64 b/fedora/configs/config-powerpc64 index 6a59e66..0edf37b 100644 --- a/fedora/configs/config-powerpc64 +++ b/fedora/configs/config-powerpc64 @@ -69,6 +69,7 @@ CONFIG_CPU_FREQ_MAPLE=y CONFIG_EDAC_AMD8111=m CONFIG_EDAC_AMD8131=m CONFIG_HW_RANDOM_AMD=m +CONFIG_MMIO_NVRAM=y
# Apple G5 CONFIG_MACINTOSH_DRIVERS=y diff --git a/fedora/configs/config-powerpc64-generic b/fedora/configs/config-powerpc64-generic index e3191a0..e0067f5 100644 --- a/fedora/configs/config-powerpc64-generic +++ b/fedora/configs/config-powerpc64-generic @@ -26,9 +26,6 @@ CONFIG_IRQSTACKS=y
CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DEBUGGER=y -CONFIG_NVRAM=y -CONFIG_GENERIC_NVRAM=y -CONFIG_MMIO_NVRAM=y CONFIG_PPC_DENORMALISATION=y # CONFIG_PPC_EARLY_DEBUG is not set CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
--- fedora/configs/config-armv7 | 6 ++++-- fedora/configs/config-armv7-generic | 1 + fedora/kernel.spec.template | 1 + 3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fedora/configs/config-armv7 b/fedora/configs/config-armv7 index 5be8074..c53aaff 100644 --- a/fedora/configs/config-armv7 +++ b/fedora/configs/config-armv7 @@ -247,7 +247,8 @@ CONFIG_TI_CPTS=y CONFIG_REGULATOR_TPS65217=y CONFIG_TI_EMIF=m CONFIG_DRM_TILCDC=m -# CONFIG_DRM_TILCDC_SLAVE_COMPAT is not set +# We only need this until the BBB dts is actually updated +CONFIG_DRM_TILCDC_SLAVE_COMPAT=y CONFIG_SPI_DAVINCI=m CONFIG_SND_DAVINCI_SOC=m CONFIG_SND_DAVINCI_SOC_I2S=m @@ -264,6 +265,7 @@ CONFIG_MFD_TPS65218=m CONFIG_REGULATOR_TPS65218=m CONFIG_INPUT_TPS65218_PWRBUTTON=m CONFIG_VIDEO_AM437X_VPFE=m +CONFIG_UIO_PRUSS=m
# QCom CONFIG_ARCH_MSM8X60=y @@ -383,9 +385,9 @@ CONFIG_IMX2_WDT=m CONFIG_HW_RANDOM_MXC_RNGA=m CONFIG_CRYPTO_DEV_SAHARA=m CONFIG_RTC_DRV_SNVS=m +CONFIG_FB_MXS=m # CONFIG_FB_MX3 is not set # CONFIG_FB_IMX is not set -# CONFIG_FB_MXS is not set
CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_FSL_ASOC_CARD=m diff --git a/fedora/configs/config-armv7-generic b/fedora/configs/config-armv7-generic index 503ccae..4b89498 100644 --- a/fedora/configs/config-armv7-generic +++ b/fedora/configs/config-armv7-generic @@ -182,6 +182,7 @@ CONFIG_MACH_SUN6I=y CONFIG_MACH_SUN7I=y CONFIG_MACH_SUN8I=y # CONFIG_MACH_SUN9I is not set +CONFIG_SUNXI_SRAM=y CONFIG_DMA_SUN6I=m CONFIG_SUNXI_WATCHDOG=m CONFIG_NET_VENDOR_ALLWINNER=y diff --git a/fedora/kernel.spec.template b/fedora/kernel.spec.template index 01feed5..fa442b4 100644 --- a/fedora/kernel.spec.template +++ b/fedora/kernel.spec.template @@ -1924,6 +1924,7 @@ fi %%CHANGELOG%% * Thu Jul 2 2015 Peter Robinson pbrobinson@fedoraproject.org - Move aarch64 relevant AMBA config options to arm-generic +- Minor ARMv7 updates
* Wed Jul 01 2015 Josh Boyer jwboyer@fedoraproject.org - 4.2.0-0.rc0.git4.1 - Linux v4.1-11549-g05a8256c586a
On Thu, Jul 2, 2015 at 10:43 AM, Peter Robinson pbrobinson@gmail.com wrote:
Just some small cleanups and updates for ARM* and Power.
Had to fixup Subject on 3/3, but no big deal. Committed locally and it will go out with the next build.
josh
kernel@lists.fedoraproject.org