[D][E][SRU][PATCH 1/1] UBUNTU: [Config] Enable CONFIG_MVPP2 for arm64

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/1835054

Enable the CONFIG_MVPP2 for arm64. This is a driver for network
controllers(s) in Marvell SOCs, particularly Armada 8040.

Corresponding configs like CONFIG_ARCH_MVEBU and CONFIG_ARCH_MULTI_V7
need to be enabled as well to meet the dependency requirement.

CONFIG_CRYPTO_DEV_SAFEXCEL and CONFIG_PCI_AARDVARK are disabled
explicitly to avoid interactive dialogues when building the kernel.

Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
 debian.master/config/annotations               | 6 +++---
 debian.master/config/arm64/config.common.arm64 | 2 +-
 debian.master/config/config.common.ubuntu      | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index cfb4bb8..046abd8 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'}>
@@ -12564,7 +12564,7 @@ CONFIG_MACH_MT8135                              policy<{'armhf': 'y'}>
 
 # Menu: System Type >> Multiple platform selection >> Architecture: arm
 CONFIG_ARCH_MULTI_V6                            policy<{'armhf': 'n'}>
-CONFIG_ARCH_MULTI_V7                            policy<{'armhf': 'y'}>
+CONFIG_ARCH_MULTI_V7                            policy<{'arm64': 'y', 'armhf': 'y'}>
 
 # Menu: System Type >> NUC950 Machines >> Architecture: arm
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 5d06a5c..10c2b68 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -27,7 +27,7 @@ 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_MVEBU=y
 CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_ROCKCHIP is not set
 CONFIG_ARCH_SUNXI=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9331441..3b491bd 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1992,6 +1992,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
@@ -6721,6 +6722,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
-- 
2.7.4