[PATCH 1/1] UBUNTU: [Config] disable NVME

[Paolo Pisati]

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

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 .../abi/4.15.0-1043.46/arm64/raspi2.modules       |  8 --------
 .../abi/4.15.0-1043.46/armhf/raspi2.modules       |  8 --------
 debian.raspi2/config/config.common.ubuntu         | 15 +++------------
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/debian.raspi2/abi/4.15.0-1043.46/arm64/raspi2.modules b/debian.raspi2/abi/4.15.0-1043.46/arm64/raspi2.modules
index c65f3527562b..ac8f3b5afbcc 100644
--- a/debian.raspi2/abi/4.15.0-1043.46/arm64/raspi2.modules
+++ b/debian.raspi2/abi/4.15.0-1043.46/arm64/raspi2.modules
@@ -2271,12 +2271,6 @@ nsh
 ntc_thermistor
 ntfs
 null_blk
-nvme-core
-nvme-fabrics
-nvme-fc
-nvme-loop
-nvmet
-nvmet-fc
 nxp-nci
 nxp-nci_i2c
 nxp-ptn3460
@@ -2350,7 +2344,6 @@ parport
 parport_ax88796
 pata_of_platform
 pata_platform
-pblk
 pc87360
 pc87427
 pcap-regulator
@@ -2699,7 +2692,6 @@ rpisense-fb
 rpisense-js
 rpmsg_core
 rpr0521
-rrpc
 rsi_91x
 rsi_sdio
 rsi_usb
diff --git a/debian.raspi2/abi/4.15.0-1043.46/armhf/raspi2.modules b/debian.raspi2/abi/4.15.0-1043.46/armhf/raspi2.modules
index b89999d2480e..ad6c834090ed 100644
--- a/debian.raspi2/abi/4.15.0-1043.46/armhf/raspi2.modules
+++ b/debian.raspi2/abi/4.15.0-1043.46/armhf/raspi2.modules
@@ -2290,12 +2290,6 @@ nsh
 ntc_thermistor
 ntfs
 null_blk
-nvme-core
-nvme-fabrics
-nvme-fc
-nvme-loop
-nvmet
-nvmet-fc
 nvram
 nxp-nci
 nxp-nci_i2c
@@ -2375,7 +2369,6 @@ parport_ax88796
 parport_pc
 pata_of_platform
 pata_platform
-pblk
 pc87360
 pc87427
 pcap-regulator
@@ -2740,7 +2733,6 @@ rpisense-fb
 rpisense-js
 rpmsg_core
 rpr0521
-rrpc
 rsi_91x
 rsi_sdio
 rsi_usb
diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 3a51daf7a9dd..f593ccaabe11 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -4224,19 +4224,10 @@ CONFIG_NR_CPUS=4
 CONFIG_NTFS_FS=m
 CONFIG_NTFS_RW=y
 # CONFIG_NUMA is not set
-CONFIG_NVM=y
+# CONFIG_NVM is not set
 CONFIG_NVMEM=y
-CONFIG_NVME_CORE=m
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_FC=m
-# CONFIG_NVME_MULTIPATH is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_FC=m
-# CONFIG_NVME_TARGET_FCLOOP is not set
-CONFIG_NVME_TARGET_LOOP=m
-# CONFIG_NVM_DEBUG is not set
-CONFIG_NVM_PBLK=m
-CONFIG_NVM_RRPC=m
+# CONFIG_NVME_FC is not set
+# CONFIG_NVME_TARGET is not set
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
-- 
2.17.1