diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 000dc61847bd..ba12657184d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -96,6 +96,14 @@ jobs:
           install -v -m644 -D SPL deploy/spl-imx6-spi
           install -v -m644 -D u-boot.img deploy/u-boot-imx6-spi.img
 
+      - name: Upload to GitHub
+        uses: actions/upload-artifact@v4
+        if: github.event_name == 'pull_request'
+        with:
+          name: imx6-uboot-${{ steps.tag_step.outputs.build_ver }}_${{ steps.tag_step.outputs.build_tag }}
+          path: deploy/
+          if-no-files-found: error
+
       - name: Upload to S3
         if: github.ref == 'refs/heads/v2018.01-solidrun-imx6' && github.event_name != 'pull_request'
         uses: shallwefootball/upload-s3-action@v1.3.3
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index f864775caa70..a4560e325dc3 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -4,23 +4,13 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_TARGET_MX6CUBOXI=y
-CONFIG_SPL_BOOT_DEVICE_MMC=y
-CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL_USB_HOST_SUPPORT=y
-# CONFIG_SPL_USB_SUPPORT is not set
-CONFIG_SPL_USB_GADGET_SUPPORT=y
-# CONFIG_SPL_USBETH_SUPPORT is not set
-CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_BOOT_DEVICE_MMC=y
 # CONFIG_CMD_BMODE is not set
-# CONFIG_FASTBOOT is not set
-CONFIG_SPL_DOS_PARTITION=y 
-# CONFIG_SPL_ISO_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 # CONFIG_SYS_STDIO_DEREGISTER is not set
@@ -28,15 +18,23 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
-# CONFIG_SPL_PARTITION_UUIDS is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_NET_RANDOM_ETHADDR_OUI="d0:63:b4:00:00:00"
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
@@ -48,23 +46,10 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="SolidRun"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_BCM_UDC_OTG_PHY is not set
-# CONFIG_USB_GADGET_DWC2_OTG is not set
 CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_SDP=y
 CONFIG_USB_ETHER=y
-# CONFIG_USB_ETH_CDC is not set
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USBNET_DEVADDR="de:ad:be:ef:00:01"
-CONFIG_USBNET_HOST_ADDR="de:ad:be:ef:00:00"
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
-# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_NET_RANDOM_ETHADDR_OUI="d0:63:b4:00:00:00"
-CONFIG_OF_BOARD_SETUP=y
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 86a6ce275434..4fb5f483f459 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -71,6 +71,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
+#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_PREBOOT \
 	"if hdmidet; then " \
 		"usb start; "		       \