diff --git a/buildroot-external/board/raspberrypi/uboot.config b/buildroot-external/board/raspberrypi/uboot.config
index 4612beb59..03070096a 100644
--- a/buildroot-external/board/raspberrypi/uboot.config
+++ b/buildroot-external/board/raspberrypi/uboot.config
@@ -1,3 +1,5 @@
+CONFIG_CMD_NVME=y
+
 # CONFIG_DOS_PARTITION is not set
 CONFIG_USB_STORAGE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y
@@ -6,3 +8,6 @@ CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 
 CONFIG_USB_XHCI_BRCM=y
+
+CONFIG_NVME=y
+CONFIG_NVME_PCI=y
diff --git a/buildroot-external/board/raspberrypi/yellow/uboot.config b/buildroot-external/board/raspberrypi/yellow/uboot.config
index ca8770635..f17cc1d0f 100644
--- a/buildroot-external/board/raspberrypi/yellow/uboot.config
+++ b/buildroot-external/board/raspberrypi/yellow/uboot.config
@@ -1,4 +1 @@
-CONFIG_NVME_PCI=y
-CONFIG_CMD_NVME=y
-CONFIG_NVME=y
 CONFIG_CMD_USB_MASS_STORAGE=y