diff mbox series

[SRU,K,01/16] UBUNTU: [Config] Disable CONFIG_CXL_MEM_RAW_COMMANDS on riscv64

Message ID 20220712120447.355124-2-emil.renner.berthing@canonical.com
State New
Headers show
Series Align RISC-V config with other archs | expand

Commit Message

Emil Renner Berthing July 12, 2022, 12:04 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1981437

This option was not annotated in the linux-riscv tree, so let's align it
with the other architectures.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 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 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 73abfdd0a295..c3fd7a196871 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -83,7 +83,6 @@  CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
 CONFIG_CRYPTO_SM3_GENERIC=m
 CONFIG_CRYPTO_SM4_GENERIC=m
 CONFIG_CXL_BUS=m
-# CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 00683d2efa9e..f2d8dacaa3bd 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -696,7 +696,7 @@  CONFIG_MHI_BUS_PCI_GENERIC                      policy<{'amd64': 'm', 'arm64': '
 # Menu: Device Drivers >> CXL (Compute Express Link) Devices Support
 CONFIG_CXL_BUS                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}>
 CONFIG_CXL_MEM                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
-CONFIG_CXL_MEM_RAW_COMMANDS                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'y', 's390x': '-'}>
+CONFIG_CXL_MEM_RAW_COMMANDS                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': '-'}>
 CONFIG_CXL_ACPI                                 policy<{'amd64': 'm', 'arm64': 'm'}>
 CONFIG_CXL_PMEM                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf-generic-lpae': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index ae43a5b2e7c4..e03083af3dc3 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -89,7 +89,6 @@  CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 CONFIG_CRYPTO_SM3_GENERIC=m
 CONFIG_CRYPTO_SM4_GENERIC=m
 CONFIG_CXL_BUS=m
-# CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index be6fe67009b8..6a146143fc34 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -81,7 +81,6 @@  CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 CONFIG_CRYPTO_SM3_GENERIC=m
 CONFIG_CRYPTO_SM4_GENERIC=m
 CONFIG_CXL_BUS=m
-# CONFIG_CXL_MEM_RAW_COMMANDS is not set
 # CONFIG_DEBUG_INFO_BTF is not set
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ff7b6fa6d27d..ab2ad1f3bc4b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2635,6 +2635,7 @@  CONFIG_CXLFLASH=m
 CONFIG_CXL_ACPI=m
 CONFIG_CXL_BASE=y
 CONFIG_CXL_MEM=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PCI=m
 CONFIG_CXL_PMEM=m
 CONFIG_CXL_PORT=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index cc98a0a6930a..eb4b93eb7026 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -83,7 +83,6 @@  CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
 CONFIG_CRYPTO_SM3_GENERIC=m
 CONFIG_CRYPTO_SM4_GENERIC=m
 CONFIG_CXL_BUS=m
-# CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 8ed1cff72616..261dbb049839 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -79,7 +79,6 @@  CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
 CONFIG_CRYPTO_SM3_GENERIC=m
 CONFIG_CRYPTO_SM4_GENERIC=m
 CONFIG_CXL_BUS=m
-CONFIG_CXL_MEM_RAW_COMMANDS=y
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536