[PATCH][F SRU] [CONFIG] Disable CONFIG_HISI_DMA

Ike Panhc ike.pan at canonical.com
Mon Aug 16 07:37:58 UTC 2021


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

Signed-off-by: Ike Panhc <ike.pan at canonical.com>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 02965367a0de..43b2307a323d 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1224,7 +1224,7 @@ CONFIG_DMA_SUN6I                                policy<{'arm64': 'm'}>
 CONFIG_DW_AXI_DMAC                              policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', }>
 CONFIG_FSL_EDMA                                 policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', }>
 CONFIG_FSL_QDMA                                 policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_HISI_DMA                                 policy<{'arm64': 'm'}>
+CONFIG_HISI_DMA                                 policy<{'arm64': 'n'}>
 CONFIG_IMX_DMA                                  policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_IMX_SDMA                                 policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_INTEL_IDMA64                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', }>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8bb2d865246b..8ce7f7cf6774 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3998,7 +3998,7 @@ CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_HISILICON_ERRATUM_161600802=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
 CONFIG_HISILICON_LPC=y
-CONFIG_HISI_DMA=m
+# CONFIG_HISI_DMA is not set
 CONFIG_HISI_FEMAC=m
 CONFIG_HISI_PMU=y
 CONFIG_HISI_THERMAL=m
-- 
2.25.1




More information about the kernel-team mailing list