--- fedora/configs/config-arm-generic | 23 +++++++++------ fedora/configs/config-arm64 | 58 ++++++++++++++----------------------- fedora/configs/config-armv7-generic | 9 +----- fedora/kernel.spec.template | 4 ++- 4 files changed, 39 insertions(+), 55 deletions(-) diff --git a/fedora/configs/config-arm-generic b/fedora/configs/config-arm-generic index 0fb0ac1..6730625 100644 --- a/fedora/configs/config-arm-generic +++ b/fedora/configs/config-arm-generic @@ -67,6 +67,7 @@ CONFIG_ARCH_VEXPRESS=y CONFIG_MFD_VEXPRESS_SYSREG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_COMMON_CLK_VERSATILE=y +CONFIG_ARM_TIMER_SP804=y CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y CONFIG_I2C_VERSATILE=m @@ -188,6 +189,9 @@ CONFIG_GPIOLIB=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_BACKLIGHT_GPIO=m +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m +CONFIG_INPUT_SOC_BUTTON_ARRAY=m CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_RESTART=y @@ -232,6 +236,16 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 +# EDAC +CONFIG_EDAC=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_LEGACY_SYSFS=y + +# VFIO +CONFIG_VFIO_PLATFORM=m +CONFIG_VFIO_AMBA=m +# CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set + # CONFIG_CRYPTO_TEST is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_XEN is not set @@ -326,12 +340,3 @@ CONFIG_CMA_AREAS=7 # CONFIG_BMP085_SPI is not set # CONFIG_TI_DAC7512 is not set # CONFIG_SPI_ROCKCHIP is not set - -# EDAC -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=m -CONFIG_EDAC_LEGACY_SYSFS=y - -CONFIG_VFIO_PLATFORM=m -# CONFIG_VFIO_AMBA is not set -# CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set diff --git a/fedora/configs/config-arm64 b/fedora/configs/config-arm64 index 6a3cfb9..882e7a1 100644 --- a/fedora/configs/config-arm64 +++ b/fedora/configs/config-arm64 @@ -7,8 +7,8 @@ CONFIG_SCHED_SMT=y # CONFIG_CPU_BIG_ENDIAN is not set # arm64 only SoCs -CONFIG_ARCH_XGENE=y CONFIG_ARCH_SEATTLE=y +CONFIG_ARCH_XGENE=y # CONFIG_ARCH_THUNDER is not set # CONFIG_ARCH_EXYNOS7 is not set # CONFIG_ARCH_FSL_LS2085A is not set @@ -26,7 +26,14 @@ CONFIG_ARM64_ERRATUM_824069=y 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 + CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARM64_64K_PAGES=y @@ -41,35 +48,14 @@ CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CMDLINE_FORCE is not set CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_CSUM=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_HAVE_NET_DSA=y -# CONFIG_HUGETLB_PAGE is not set CONFIG_HVC_DRIVER=y CONFIG_HZ=100 CONFIG_KVM=y CONFIG_KVM_ARM_MAX_VCPUS=8 -CONFIG_NFS_ACL_SUPPORT=y -CONFIG_NFS_COMMON=y -CONFIG_NFS_DEBUG=y -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_NFSD_V2_ACL=y -CONFIG_NFS_USE_KERNEL_DNS=y -# CONFIG_PL330_DMA is not set CONFIG_RCU_FANOUT=64 -# CONFIG_RTC_DRV_PL030 is not set -CONFIG_RTC_DRV_PL031=y -CONFIG_SERIAL_8250_DMA=y -# CONFIG_SERIAL_AMBA_PL010 is not set CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y @@ -83,6 +69,18 @@ CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_RTC_DRV_EFI=y +CONFIG_ACPI=y +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_EC_DEBUGFS=y +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_IPMI=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HED=m +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_PCC=y + CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM64_CE=m CONFIG_CRYPTO_SHA2_ARM64_CE=m @@ -130,18 +128,7 @@ CONFIG_I2C_SCMI=m CONFIG_I2C_XGENE_SLIMPRO=m CONFIG_SENSORS_ACPI_POWER=m -CONFIG_ACPI=y -CONFIG_ACPI_PROCFS_POWER=y -CONFIG_ACPI_EC_DEBUGFS=y -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_IPMI=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HED=m -CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_PCC=y - +# AMD Seattle CONFIG_NET_SB1000=y CONFIG_AMD_XGBE=m CONFIG_AMD_XGBE_PHY=m @@ -168,6 +155,3 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_FSL_MC_BUS is not set -# CONFIG_ARM_TIMER_SP804 is not set - -CONFIG_ARM_SMMU_V3=y diff --git a/fedora/configs/config-armv7-generic b/fedora/configs/config-armv7-generic index fb4bb285..5a24a4b 100644 --- a/fedora/configs/config-armv7-generic +++ b/fedora/configs/config-armv7-generic @@ -156,8 +156,6 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_APPENDED_DTB=y # General vexpress ARM drivers -CONFIG_ARM_TIMER_SP804=y - CONFIG_SERIO_AMBAKMI=m CONFIG_SERIAL_AMBA_PL010=y CONFIG_SERIAL_AMBA_PL010_CONSOLE=y @@ -180,6 +178,7 @@ CONFIG_EDAC_HIGHBANK_L2=m CONFIG_SATA_HIGHBANK=m CONFIG_ARM_HIGHBANK_CPUFREQ=m # CONFIG_ARM_HIGHBANK_CPUIDLE is not set +CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m # AllWinner # CONFIG_MACH_SUN4I is not set @@ -591,8 +590,6 @@ CONFIG_INPUT_GPIO=m CONFIG_INPUT_GPIO_BEEPER=m CONFIG_INPUT_GPIO_TILT_POLLED=m CONFIG_INPUT_MATRIXKMAP=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_MATRIX=m # CONFIG_GPIO_RCAR is not set CONFIG_W1_MASTER_GPIO=m @@ -773,7 +770,6 @@ CONFIG_LCD_HX8357=m CONFIG_INPUT_GP2A=m CONFIG_INPUT_ARIZONA_HAPTICS=m CONFIG_INPUT_MC13783_PWRBUTTON=m -CONFIG_INPUT_SOC_BUTTON_ARRAY=m CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_AD7877=m @@ -825,9 +821,6 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y -# vfio -# CONFIG_VFIO_PLATFORM is not set - # Sensors CONFIG_SENSORS_HTU21=m diff --git a/fedora/kernel.spec.template b/fedora/kernel.spec.template index 338e440..2b34791 100644 --- a/fedora/kernel.spec.template +++ b/fedora/kernel.spec.template @@ -1923,11 +1923,13 @@ fi # %changelog %%CHANGELOG%% +* Tue Jun 30 2015 Peter Robinson <pbrobinson@xxxxxxxxxxxxxxxxx> +- Minor Aarch64 updates and cleanups + * Mon Jun 29 2015 Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> - 4.1.0-0.rc0.git2.1 - Linux v4.1-11235-gc63f887bdae8 - Reenable debugging options. - * Fri Jun 26 2015 Peter Robinson <pbrobinson@xxxxxxxxxxxxxxxxx> - Reorganisation and cleanup of the powerpc configs -- 2.4.3 _______________________________________________ kernel mailing list kernel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/kernel
