diff options
| -rw-r--r-- | config-armv7 | 11 | ||||
| -rw-r--r-- | config-armv7-generic | 37 | ||||
| -rw-r--r-- | config-armv7-lpae | 1 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 28 insertions, 24 deletions
diff --git a/config-armv7 b/config-armv7 index df5439dd0..6f39af2ec 100644 --- a/config-armv7 +++ b/config-armv7 @@ -10,7 +10,6 @@ CONFIG_ARCH_OMAP4=y CONFIG_ARCH_PICOXCELL=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SOCFPGA=y -CONFIG_ARCH_SUNXI=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_U8500=y # CONFIG_ARCH_VIRT is not set @@ -32,7 +31,6 @@ CONFIG_CACHE_TAUROS2=y CONFIG_MV_XOR=y CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_MV643XX_ETH=m -CONFIG_I2C_MV64XXX=m CONFIG_PINCTRL_MVEBU=y CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_XP=y @@ -321,15 +319,6 @@ CONFIG_PWM_TIPWMSS=y CONFIG_SND_AM33XX_SOC_EVM=m # CONFIG_GPIO_DAVINCI is not set -# Allwinner a1x -CONFIG_PINCTRL_SUNXI=y -CONFIG_SUNXI_WATCHDOG=m -CONFIG_MDIO_SUN4I=m -CONFIG_NET_VENDOR_ALLWINNER=y -CONFIG_SUN4I_EMAC=m -CONFIG_EEPROM_SUNXI_SID=m -CONFIG_RTC_DRV_SUNXI=m - # i.MX CONFIG_MXC_IRQ_PRIOR=y # CONFIG_MXC_DEBUG_BOARD is not set diff --git a/config-armv7-generic b/config-armv7-generic index a4bd1668e..693cfc28a 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -50,6 +50,7 @@ CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y # Platforms enabled/disabled globally on ARMv7 CONFIG_ARCH_HIGHBANK=y +CONFIG_ARCH_SUNXI=y CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y # CONFIG_ARCH_VEXPRESS_SPC is not set @@ -64,13 +65,6 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y # CONFIG_ARCH_HI3xxx is not set # CONFIG_ARCH_MSM_DT is not set -# highbank -CONFIG_EDAC_HIGHBANK_MC=m -CONFIG_EDAC_HIGHBANK_L2=m -CONFIG_SATA_HIGHBANK=m -CONFIG_ARM_HIGHBANK_CPUFREQ=m -# CONFIG_ARM_HIGHBANK_CPUIDLE is not set - # errata # v5/v6 # CONFIG_ARM_ERRATA_326103 is not set @@ -125,11 +119,6 @@ CONFIG_ARM_GLOBAL_TIMER=y CONFIG_XZ_DEC_ARM=y -# Power management -CONFIG_PM_OPP=y -CONFIG_ARM_CPU_SUSPEND=y -CONFIG_GENERIC_CPUFREQ_CPU0=m - CONFIG_LOCAL_TIMERS=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_CC_STACKPROTECTOR=y @@ -166,6 +155,24 @@ CONFIG_ARM_SP805_WATCHDOG=m CONFIG_GPIO_PL061=y CONFIG_PL320_MBOX=y +# highbank +CONFIG_EDAC_HIGHBANK_MC=m +CONFIG_EDAC_HIGHBANK_L2=m +CONFIG_SATA_HIGHBANK=m +CONFIG_ARM_HIGHBANK_CPUFREQ=m +# CONFIG_ARM_HIGHBANK_CPUIDLE is not set + +# Allwinner a1x +CONFIG_PINCTRL_SUNXI=y +CONFIG_SUNXI_WATCHDOG=m +CONFIG_MDIO_SUN4I=m +CONFIG_NET_VENDOR_ALLWINNER=y +CONFIG_SUN4I_EMAC=m +CONFIG_STMMAC_PLATFORM=y +CONFIG_DWMAC_SUNXI=y +CONFIG_EEPROM_SUNXI_SID=m +CONFIG_RTC_DRV_SUNXI=m + CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m @@ -173,6 +180,11 @@ CONFIG_REGMAP_SPMI=m CONFIG_REGMAP_MMIO=m CONFIG_REGMAP_IRQ=y +# Power management +CONFIG_PM_OPP=y +CONFIG_ARM_CPU_SUSPEND=y +CONFIG_GENERIC_CPUFREQ_CPU0=m + # usb CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set @@ -309,6 +321,7 @@ CONFIG_NFC_NCI_SPI=y # i2c CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PLATFORM=m +CONFIG_I2C_MV64XXX=m # HW crypto and rng CONFIG_CRYPTO_SHA1_ARM=m diff --git a/config-armv7-lpae b/config-armv7-lpae index beed9a81b..c635efd4f 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -14,7 +14,6 @@ CONFIG_ARCH_EXYNOS5=y # CONFIG_SOC_AM43XX is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_SOCFPGA is not set -# CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_ZYNQ is not set diff --git a/kernel.spec b/kernel.spec index 0dadec6ab..84edb6619 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2073,6 +2073,9 @@ fi # ||----w | # || || %changelog +* Mon Jan 27 2014 Peter Robinson <pbrobinson@fedoraproject.org> +- Build AllWinner (sunxi) on LPAE too (Cortex-A7 supports LPAE/KVM) + * Mon Jan 27 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git12.1 - Linux v3.13-8631-gba635f8 |