diff mbox

[Xenial] UBUNTU: [Config] CONFIG_ARM_SMMU=y on arm64

Message ID 20160220011403.GA5987@fluid.dannf
State New
Headers show

Commit Message

dann frazier Feb. 20, 2016, 1:14 a.m. UTC
The Cavium ThunderX SoC includes this device.

Signed-off-by: dann frazier <dann.frazier@canonical.com>
---
 debian.master/config/annotations               | 2 +-
 debian.master/config/arm64/config.common.arm64 | 1 +
 debian.master/config/armhf/config.common.armhf | 1 +
 debian.master/config/config.common.ubuntu      | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f13dc79..0088f35 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2017,7 +2017,7 @@  CONFIG_EXYNOS_IOMMU_DEBUG                       policy<{'armhf': 'n'}>
 CONFIG_SHMOBILE_IOMMU                           policy<{'armhf': 'y'}>
 CONFIG_IPMMU_VMSA                               policy<{'armhf-generic-lpae': 'y'}>
 CONFIG_SPAPR_TCE_IOMMU                          policy<{'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y'}>
-CONFIG_ARM_SMMU                                 policy<{'arm64': 'n', 'armhf': 'n'}>
+CONFIG_ARM_SMMU                                 policy<{'arm64': 'y', 'armhf': 'n'}>
 CONFIG_ARM_SMMU_V3                              policy<{'arm64': 'y'}>
 #
 CONFIG_INTEL_IOMMU_DEFAULT_ON                   note<the IOMMU can trigger boot failures> flag<REVIEW>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 442ade1e..4e4d4a4 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -20,6 +20,7 @@  CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 # CONFIG_ARCH_TEGRA is not set
 CONFIG_ARCNET=m
+CONFIG_ARM_SMMU=y
 CONFIG_ATALK=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_GENERIC=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 6bbb94a..8d34365 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -17,6 +17,7 @@  CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARCNET=m
+# CONFIG_ARM_SMMU is not set
 CONFIG_ATALK=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_GENERIC=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index cb8cc1e..09751c7 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -576,7 +576,6 @@  CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_SCPI_CPUFREQ=m
 CONFIG_ARM_SCPI_PROTOCOL=m
-# CONFIG_ARM_SMMU is not set
 CONFIG_ARM_SMMU_V3=y
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_TEGRA124_CPUFREQ=m