Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / include / configs / pico-imx6ul.h

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 6a19861da7dc8c7cd04204541696a69d5c3838b7..62feb224ac790078efbcedbede89511b7bc93d21 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -42,8 +42,6 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
@@ -68,10 +66,14 @@
        "mmcautodetect=yes\0" \
        CONFIG_DFU_ENV_SETTINGS \
        "finduuid=part uuid mmc 0:2 uuid\0" \
+       "partitions=" \
+               "uuid_disk=${uuid_gpt_disk};" \
+               "name=boot,size=16MiB;name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \
+       "setup_emmc=gpt write mmc 0 $partitions; reset;\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=PARTUUID=${uuid} rootwait rw\0" \
-       "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+       "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
+       "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run finduuid; " \
                "run mmcargs; " \