--- 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@xxxxxxxxxxxxxxxxx> +- Move aarch64 relevant AMBA config options to arm-generic + * Wed Jul 01 2015 Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> - 4.2.0-0.rc0.git4.1 - Linux v4.1-11549-g05a8256c586a -- 2.4.3 _______________________________________________ kernel mailing list kernel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/kernel
