Enable mvebu on the lpae kernel

It has LPAE, there are boards that can have more than 4GiB ram. Anaconda
defaults to installing LPAE when the hardware supports it, so any install
today will not work post install.

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

4 files changed, 54 insertions, 52 deletions

diff --git a/config-armv7 b/config-armv7
index a37d238b7..2063c092c 100644
--- a/config-armv7
+++ b/config-armv7
@@ -2,7 +2,6 @@
 
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_KEYSTONE is not set
-CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
@@ -18,56 +17,6 @@ CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARM_VIRT_EXT is not set
 # CONFIG_VIRTUALIZATION is not set
 
-# mvebu
-CONFIG_MACH_ARMADA_370=y
-CONFIG_MACH_ARMADA_375=y
-CONFIG_MACH_ARMADA_38X=y
-CONFIG_MACH_ARMADA_XP=y
-CONFIG_MACH_DOVE=y
-
-CONFIG_MVEBU_DEVBUS=y
-CONFIG_PCI_MVEBU=y
-CONFIG_CACHE_TAUROS2=y
-CONFIG_MV_XOR=y
-CONFIG_CRYPTO_DEV_MV_CESA=m
-CONFIG_MV643XX_ETH=m
-CONFIG_PINCTRL_MVEBU=y
-CONFIG_PINCTRL_ARMADA_370=y
-CONFIG_PINCTRL_ARMADA_XP=y
-# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
-CONFIG_PINCTRL_DOVE=y
-CONFIG_EDAC_MV64X60=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_88PM80X=m
-CONFIG_RTC_DRV_ISL12057=m
-CONFIG_RTC_DRV_MV=m
-CONFIG_RTC_DRV_ARMADA38X=m
-CONFIG_MVNETA=m
-CONFIG_GPIO_MVEBU=y
-CONFIG_MVEBU_CLK_CORE=y
-CONFIG_MVEBU_CLK_COREDIV=y
-CONFIG_MMC_MVSDIO=m
-CONFIG_MMC_SDHCI_DOVE=m
-CONFIG_SPI_ORION=m
-CONFIG_USB_MV_UDC=m
-CONFIG_MVEBU_MBUS=y
-CONFIG_USB_XHCI_MVEBU=m
-CONFIG_PHY_MVEBU_SATA=y
-CONFIG_AHCI_MVEBU=m
-CONFIG_ARMADA_THERMAL=m
-CONFIG_DOVE_THERMAL=m
-CONFIG_DRM_ARMADA=m
-CONFIG_ORION_WATCHDOG=m
-CONFIG_SND_KIRKWOOD_SOC=m
-CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
-CONFIG_USB_EHCI_HCD_ORION=m
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MVPP2=m
-CONFIG_COMMON_CLK_SI5351=m
-CONFIG_RTC_DRV_ARMADA38X=m
-# CONFIG_CACHE_FEROCEON_L2 is not set
-# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
-
 # omap 
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_OMAP5=y
diff --git a/config-armv7-generic b/config-armv7-generic
index b85382994..e321d8a1f 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -399,6 +399,57 @@ CONFIG_RTC_DRV_AS3722=y
 CONFIG_TI_SOC_THERMAL=m
 CONFIG_TI_THERMAL=y
 
+# mvebu
+CONFIG_ARCH_MVEBU=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_375=y
+CONFIG_MACH_ARMADA_38X=y
+CONFIG_MACH_ARMADA_XP=y
+CONFIG_MACH_DOVE=y
+
+CONFIG_MVEBU_DEVBUS=y
+CONFIG_PCI_MVEBU=y
+CONFIG_CACHE_TAUROS2=y
+CONFIG_MV_XOR=y
+CONFIG_CRYPTO_DEV_MV_CESA=m
+CONFIG_MV643XX_ETH=m
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_370=y
+CONFIG_PINCTRL_ARMADA_XP=y
+# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
+CONFIG_PINCTRL_DOVE=y
+CONFIG_EDAC_MV64X60=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ISL12057=m
+CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_MVNETA=m
+CONFIG_GPIO_MVEBU=y
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_COREDIV=y
+CONFIG_MMC_MVSDIO=m
+CONFIG_MMC_SDHCI_DOVE=m
+CONFIG_SPI_ORION=m
+CONFIG_USB_MV_UDC=m
+CONFIG_MVEBU_MBUS=y
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_PHY_MVEBU_SATA=y
+CONFIG_AHCI_MVEBU=m
+CONFIG_ARMADA_THERMAL=m
+CONFIG_DOVE_THERMAL=m
+CONFIG_DRM_ARMADA=m
+CONFIG_ORION_WATCHDOG=m
+CONFIG_SND_KIRKWOOD_SOC=m
+CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MVPP2=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_RTC_DRV_ARMADA38X=m
+# CONFIG_CACHE_FEROCEON_L2 is not set
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
+
 # DRM panels
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_SIMPLE=m
diff --git a/config-armv7-lpae b/config-armv7-lpae
index f11719392..7600dd40e 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -1,7 +1,6 @@
 # ARM A15 lpae unified arch kernel
 CONFIG_ARCH_KEYSTONE=y
 
-# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_OMAP3 is not set
 # CONFIG_ARCH_OMAP4 is not set
diff --git a/kernel.spec b/kernel.spec
index f3ed10050..e8aa6d8b2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2193,6 +2193,9 @@ fi
 #
 # 
 %changelog
+* Mon Apr 20 2015 Dennis Gilmore <dennis@ausil.us>
+- enable mvebu for the LPAE kernel
+
 * Mon Apr 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git9.1
 - Linux v4.0-8158-g09d51602cf84