Revert "Revert "Add NVME block device support and userspace utilities""
This reverts commit 6dc084f36646d333e636b1ad362912fc686925b4.
With linux 4.4.20 the shutdown issues with NVMe appear to be resolved -
re-enable support by reverting the original revert.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
(cherry picked from commit 45617489fb5024b4219cbdd85704a4496ff2c34b)
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 688524d..d2e60ef 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -71,6 +71,7 @@
CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_ATA_OVER_ETH=m
CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_NVME=m
CONFIG_EEPROM_AT24=y
# CONFIG_CXL is not set
CONFIG_BLK_DEV_SD=m
diff --git a/openpower/package/petitboot/Config.in b/openpower/package/petitboot/Config.in
index 327f852..e5769de 100644
--- a/openpower/package/petitboot/Config.in
+++ b/openpower/package/petitboot/Config.in
@@ -13,6 +13,8 @@
select BR2_PACKAGE_POWERPC_UTILS if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
# run-time dependency only
select BR2_PACKAGE_IPRUTILS if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
+ # run-time dependency only
+ select BR2_PACKAGE_NVME if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
help
Petitboot is a small kexec-based bootloader