Enable Marvell mvebu for aarch64

5 files changed, 38 insertions, 30 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 2440e92fd..4153f33c0 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -111,6 +111,41 @@ CONFIG_CLKSRC_VERSATILE=y
 CONFIG_POWER_RESET_VERSATILE=y
 # CONFIG_ARM_CHARLCD is not set
 
+# Marvell EBU
+CONFIG_ARCH_MVEBU=y
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_SERIAL_MVEBU_CONSOLE=y
+CONFIG_MVEBU_DEVBUS=y
+CONFIG_MVEBU_MBUS=y
+CONFIG_PCI_MVEBU=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_MV_XOR=y
+CONFIG_CRYPTO_DEV_MV_CESA=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_ARMADA_THERMAL=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MV643XX_ETH=m
+CONFIG_PINCTRL_MVEBU=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_MVNETA_BM_ENABLE=m
+CONFIG_GPIO_MVEBU=y
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_COREDIV=y
+CONFIG_MMC_MVSDIO=m
+CONFIG_SPI_ORION=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_PHY_MVEBU_SATA=y
+CONFIG_AHCI_MVEBU=m
+# CONFIG_CACHE_FEROCEON_L2 is not set
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
+
 # Rockchips
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_I2C_RK3X=m
diff --git a/config-arm64 b/config-arm64
index c13e44f5f..60aa6cbbe 100644
--- a/config-arm64
+++ b/config-arm64
@@ -15,7 +15,6 @@ CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
-# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_SPRD is not set
 # CONFIG_ARCH_STRATIX10 is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 5f275be66..063b57e11 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -395,7 +395,6 @@ CONFIG_TI_THERMAL=y
 CONFIG_MMC_OMAP_HS=m
 
 # mvebu
-CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_375=y
 CONFIG_MACH_ARMADA_38X=y
@@ -403,45 +402,18 @@ CONFIG_MACH_ARMADA_39X=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_CRYPTO_DEV_MARVELL_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_MVNETA_BM_ENABLE=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
diff --git a/config-generic b/config-generic
index 8ac3fbb59..82db0f623 100644
--- a/config-generic
+++ b/config-generic
@@ -2640,7 +2640,6 @@ CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_SERIAL_MVEBU_UART is not set
 # CONFIG_ISI is not set
 # CONFIG_RIO is not set
 CONFIG_SERIAL_JSM=m
diff --git a/kernel.spec b/kernel.spec
index 38efae764..b036ce695 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2149,6 +2149,9 @@ fi
 #
 # 
 %changelog
+* Thu Jul  7 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable Marvell mvebu for aarch64
+
 * Tue Jul 05 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc6.git0.1
 - Linux v4.7-rc6
 - Disable debugging options.