[D][E][SRU][PATCHv2 1/1] UBUNTU: [Config] Enable Armada SOCs and MVPP2 NIC driver for disco/generic arm64
Po-Hsu Lin
po-hsu.lin at canonical.com
Mon Jul 15 07:09:22 UTC 2019
BugLink: https://bugs.launchpad.net/bugs/1835054
Enable the Armada SOCs (ARCH_MVEBU) and the MVPP2 NIC driver for arm64.
We already have these enabled for armhf, but not arm64.
Other configs were added by the updateconfigs process
Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
debian.master/config/annotations | 4 ++--
debian.master/config/arm64/config.common.arm64 | 1 -
debian.master/config/armhf/config.common.armhf | 1 -
debian.master/config/config.common.ubuntu | 14 ++++++++++++++
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index cfb4bb8..3095110 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5339,7 +5339,7 @@ CONFIG_MV643XX_ETH policy<{'armhf': 'm'}>
CONFIG_MVMDIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
CONFIG_MVNETA_BM_ENABLE policy<{'armhf': 'n'}>
CONFIG_MVNETA policy<{'armhf': 'm'}>
-CONFIG_MVPP2 policy<{'armhf': 'm'}>
+CONFIG_MVPP2 policy<{'arm64': 'm', 'armhf': 'm'}>
CONFIG_PXA168_ETH policy<{'arm64': 'm', 'armhf': 'm'}>
CONFIG_SKGE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
CONFIG_SKGE_DEBUG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
@@ -11494,7 +11494,7 @@ CONFIG_ARCH_EXYNOS policy<{'arm64': 'n', 'armhf': '
CONFIG_ARCH_HISI policy<{'arm64': 'y', 'armhf': 'y'}>
CONFIG_ARCH_MEDIATEK policy<{'arm64': 'y', 'armhf': 'y'}>
CONFIG_ARCH_MESON policy<{'arm64': 'n', 'armhf': 'y'}>
-CONFIG_ARCH_MVEBU policy<{'arm64': 'n', 'armhf': 'y'}>
+CONFIG_ARCH_MVEBU policy<{'arm64': 'y', 'armhf': 'y'}>
CONFIG_ARCH_MXC policy<{'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n'}>
CONFIG_ARCH_QCOM policy<{'arm64': 'y', 'armhf': 'y'}>
CONFIG_ARCH_RENESAS policy<{'arm64': 'y', 'armhf': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 5d06a5c..75665ed 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -27,7 +27,6 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=18
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-# CONFIG_ARCH_MVEBU is not set
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_ROCKCHIP is not set
CONFIG_ARCH_SUNXI=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index eeed0db..eb75010 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -21,7 +21,6 @@ CONFIG_ARCH_MESON=y
CONFIG_ARCH_MMAP_RND_BITS=8
CONFIG_ARCH_MMAP_RND_BITS_MAX=16
CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_ROCKCHIP=y
# CONFIG_ARCH_SUNXI is not set
CONFIG_ARCH_UNIPHIER=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9331441..6436c46 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -435,6 +435,7 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCH_MULTI_V6 is not set
CONFIG_ARCH_MULTI_V6_V7=y
CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
# CONFIG_ARCH_NETX is not set
CONFIG_ARCH_NPCM=y
@@ -613,9 +614,12 @@ CONFIG_ARMADA_370_CLK=y
CONFIG_ARMADA_370_XP_IRQ=y
CONFIG_ARMADA_370_XP_TIMER=y
CONFIG_ARMADA_375_CLK=y
+CONFIG_ARMADA_37XX_CLK=y
CONFIG_ARMADA_37XX_WATCHDOG=m
CONFIG_ARMADA_38X_CLK=y
CONFIG_ARMADA_39X_CLK=y
+CONFIG_ARMADA_AP806_SYSCON=y
+CONFIG_ARMADA_CP110_SYSCON=y
CONFIG_ARMADA_THERMAL=y
CONFIG_ARMADA_XP_CLK=y
CONFIG_ARMV8_DEPRECATED=y
@@ -1992,6 +1996,7 @@ CONFIG_CRYPTO_DEV_QCE=m
CONFIG_CRYPTO_DEV_QCOM_RNG=m
# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
CONFIG_CRYPTO_DEV_S5P=m
+# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
CONFIG_CRYPTO_DEV_SAHARA=m
CONFIG_CRYPTO_DEV_SP_CCP=y
CONFIG_CRYPTO_DEV_SP_PSP=y
@@ -5825,7 +5830,12 @@ CONFIG_MVEBU_CLK_COMMON=y
CONFIG_MVEBU_CLK_COREDIV=y
CONFIG_MVEBU_CLK_CPU=y
CONFIG_MVEBU_DEVBUS=y
+CONFIG_MVEBU_GICP=y
+CONFIG_MVEBU_ICU=y
CONFIG_MVEBU_MBUS=y
+CONFIG_MVEBU_ODMI=y
+CONFIG_MVEBU_PIC=y
+CONFIG_MVEBU_SEI=y
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
CONFIG_MVMDIO=m
@@ -6721,6 +6731,7 @@ CONFIG_PCIE_ROCKCHIP_HOST=m
CONFIG_PCIE_UNIPHIER=y
CONFIG_PCIE_XILINX=y
CONFIG_PCIE_XILINX_NWL=y
+# CONFIG_PCI_AARDVARK is not set
CONFIG_PCI_ATMEL=m
CONFIG_PCI_ATS=y
CONFIG_PCI_BIOS=y
@@ -6882,8 +6893,11 @@ CONFIG_PINCTRL_APQ8064=m
CONFIG_PINCTRL_APQ8084=m
CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_375=y
+CONFIG_PINCTRL_ARMADA_37XX=y
CONFIG_PINCTRL_ARMADA_38X=y
CONFIG_PINCTRL_ARMADA_39X=y
+CONFIG_PINCTRL_ARMADA_AP806=y
+CONFIG_PINCTRL_ARMADA_CP110=y
CONFIG_PINCTRL_ARMADA_XP=y
CONFIG_PINCTRL_AS370=y
CONFIG_PINCTRL_AS3722=y
--
2.7.4
More information about the kernel-team
mailing list