Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[platform/kernel/u-boot.git] / include / configs / colibri_imx7.h

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ade4df5..7c00f78 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -16,17 +16,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
-/* Network */
-#define CONFIG_FEC_MXC
-#define CONFIG_FEC_XCV_TYPE             RMII
-#define CONFIG_ETHPRIME                 "FEC"
-#define CONFIG_FEC_MXC_PHYADDR          0
-
-#define CONFIG_TFTP_TSIZE
-
-/* ENET1 */
-#define IMX_FEC_BASE                   ENET_IPS_BASE_ADDR
-
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND
@@ -43,6 +32,22 @@
 #define CONFIG_NETMASK                 255.255.255.0
 #define CONFIG_SERVERIP                        192.168.10.1
 
+#if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
+#define UBOOT_UPDATE \
+       "uboot_hwpart=1\0" \
+       "uboot_blk=2\0" \
+       "set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && " \
+               "setexpr blkcnt ${blkcnt} / 0x200\0" \
+       "update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
+               "mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0"
+#elif defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
+#define UBOOT_UPDATE \
+       "update_uboot=nand erase.part u-boot1 && " \
+               "nand write ${loadaddr} u-boot1 ${filesize} && " \
+               "nand erase.part u-boot2 && " \
+               "nand write ${loadaddr} u-boot2 ${filesize}\0"
+#endif
+
 #ifndef PARTS_DEFAULT
 /* Define the default GPT table for eMMC */
 #define PARTS_DEFAULT \
@@ -103,34 +108,10 @@
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x82000000\0" \
-       "fdt_high=0xffffffff\0" \
-       "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x81000000\0" \
        "ramdisk_addr_r=0x82100000\0" \
        "scriptaddr=0x82500000\0"
 
-#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
-#define SD_BOOTDEV 0
-#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
-#define SD_BOOTDEV 1
-#endif
-
-#define SD_BOOTCMD \
-       "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \
-       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
-       "setenv bootargs ${defargs} ${sdargs} " \
-       "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-       "run m4boot && " \
-       "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
-       "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \
-       "${soc}-colibri-${fdt_board}.dtb && " \
-       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-       "sdbootpart=1\0" \
-       "sddev=" __stringify(SD_BOOTDEV) "\0" \
-       "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
-       "sdrootpart=2\0"
-
-
 #define NFS_BOOTCMD \
        "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
        "nfsboot=run setup; " \
@@ -184,8 +165,8 @@
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
-       SD_BOOTCMD \
        MODULE_EXTRA_ENV_SETTINGS \
+       UBOOT_UPDATE \
        "boot_file=zImage\0" \
        "console=ttymxc0\0" \
        "defargs=\0" \
@@ -235,15 +216,8 @@
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-#define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \
-                                        CONFIG_TDX_CFG_BLOCK_OFFSET)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART                1
-#elif defined(CONFIG_ENV_IS_IN_NAND)
-#define CONFIG_ENV_SECT_SIZE           (128 * 1024)
-#define CONFIG_ENV_OFFSET              (28 * CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
 #endif
 
 #ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND