diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-14 11:50:54 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-14 11:50:54 +0100 |
| commit | e6fe4bd989b93b1f37a25771fc14478dd33aa0df (patch) | |
| tree | 58943761873a212fa7d7547e5220b16d67fb5daa /include/configs/mx6sabre_common.h | |
| parent | b02bfc4dfcef3be8276521e1933573e97a5cf203 (diff) | |
| parent | a6bbee66197759f790de83181924bf1d2cf482b2 (diff) | |
| download | olio-uboot-2014.01-e6fe4bd989b93b1f37a25771fc14478dd33aa0df.tar.xz olio-uboot-2014.01-e6fe4bd989b93b1f37a25771fc14478dd33aa0df.zip | |
Merge 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx6sabre_common.h')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 21c848f90..5ee7fa544 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -95,6 +95,28 @@ #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 +#ifdef CONFIG_SUPPORT_EMMC_BOOT +#define EMMC_ENV \ + "emmcdev=2\0" \ + "update_emmc_firmware=" \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "if ${get_cmd} ${update_sd_firmware_filename}; then " \ + "if mmc dev ${emmcdev} && " \ + "mmc open ${emmcdev} 1; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ + "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ + "mmc close ${emmcdev} 1; " \ + "fi; " \ + "fi\0" +#else +#define EMMC_ENV "" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ @@ -121,6 +143,7 @@ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ "fi; " \ "fi\0" \ + EMMC_ENV \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ |