Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 0a52a701c628c0f65096fa9c760d7ba534dbfc05..f5f86f083c61bfcd3617cab477bb3aa028783403 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -83,6 +83,7 @@
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(MMC, mmc, 1) \
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(MMC, mmc, 1) \

+       func(MMC, mmc, 0) \

        func(USB, usb, 0) \
        func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
        func(USB, usb, 0) \
        func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>


@@ -92,14 +93,6 @@
 #define BOOTENV
 #endif /* CONFIG_SPL_BUILD */
 
 #define BOOTENV
 #endif /* CONFIG_SPL_BUILD */
 

-#define DFU_ALT_EMMC_INFO \
-       "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \
-       "boot part 0 1;" \
-       "rootfs part 0 2;" \
-       "zImage fat 0 1;" \
-       "imx6dl-colibri-eval-v3.dtb fat 0 1;" \
-       "imx6dl-colibri-cam-eval-v3.dtb fat 0 1"
-

 #define UBOOT_UPDATE \
        "uboot_hwpart=1\0" \
        "uboot_blk=8a\0" \
 #define UBOOT_UPDATE \
        "uboot_hwpart=1\0" \
        "uboot_blk=8a\0" \


@@ -111,24 +104,6 @@
        "update_spl=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
                "mmc write ${loadaddr} ${uboot_spl_blk} ${blkcnt}\0"
 
        "update_spl=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
                "mmc write ${loadaddr} ${uboot_spl_blk} ${blkcnt}\0"
 

-#define EMMC_BOOTCMD \
-       "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} "\
-               "rw,noatime rootfstype=ext4 " \
-               "rootwait\0" \
-       "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
-               "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \
-               "${vidargs}; echo Booting from internal eMMC chip...; " \
-               "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} " \
-               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
-               "bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "emmcbootpart=1\0" \
-       "emmcdev=0\0" \
-       "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
-               "${fdt_addr_r} ${fdt_file} && " \
-               "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \
-       "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
-       "emmcrootpart=2\0"
-

 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x12100000\0" \
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x12100000\0" \


@@ -157,8 +132,6 @@
        "boot_file=zImage\0" \
        "console=ttymxc0\0" \
        "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
        "boot_file=zImage\0" \
        "console=ttymxc0\0" \
        "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \

-       "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \
-       EMMC_BOOTCMD \

        "fdt_file=" FDT_FILE "\0" \
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
        "fdt_file=" FDT_FILE "\0" \
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \