diff --git a/Makefile b/Makefile
index 377f06729a..0b9a4d70b3 100644
--- a/Makefile
+++ b/Makefile
@@ -254,7 +254,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \

 HOSTCC       = cc
 HOSTCXX      = c++
-HOSTCFLAGS   = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \
+HOSTCFLAGS   = -Wall -Wno-error=int-conversion -Wstrict-prototypes -O2 -fomit-frame-pointer \
                $(if $(CONFIG_TOOLS_DEBUG),-g)
 HOSTCXXFLAGS = -O2

@@ -369,7 +369,7 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

 KBUILD_CPPFLAGS := -D__KERNEL__ -D__UBOOT__

-KBUILD_CFLAGS   := -Wall -Wstrict-prototypes \
+KBUILD_CFLAGS   := -Wall -Wno-error=int-conversion -Wstrict-prototypes \
                   -Wno-format-security \
                   -fno-builtin -ffreestanding $(CSTD_FLAG)
 KBUILD_CFLAGS  += -fshort-wchar
diff --git a/mntreform-config b/mntreform-config
index 236c09ac5e..ef461def51 100644
--- a/mntreform-config
+++ b/mntreform-config
@@ -276,6 +276,7 @@ CONFIG_BOOTCOMMAND="run distro_bootcmd"
 # Console
 #
 CONFIG_MENU=y
+CONFIG_MENU_SHOW=y
 # CONFIG_CONSOLE_RECORD is not set
 CONFIG_LOGLEVEL=4
 CONFIG_SPL_LOGLEVEL=4
@@ -422,7 +423,7 @@ CONFIG_CMD_BOOTEFI=y
 CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
 # CONFIG_CMD_BOOTEFI_HELLO is not set
 # CONFIG_CMD_BOOTEFI_SELFTEST is not set
-# CONFIG_CMD_BOOTMENU is not set
+CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_ELF=y
 CONFIG_CMD_FDT=y
 CONFIG_CMD_GO=y
@@ -1344,3 +1345,8 @@ CONFIG_EFI_LOADER=y
 CONFIG_OPTEE_LOAD_ADDR=0x00000000
 # CONFIG_BOOTM_OPTEE is not set
 # CONFIG_UNIT_TEST is not set
+
+# NVME support (test)
+CONFIG_NVME=y
+CONFIG_CMD_NVME=y
+