diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2016-11-29 06:27:59 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-03 18:21:07 (GMT) |
| commit | 2a77788439ab08409d449fe08419f3a0e3709a3a (patch) | |
| tree | 0de05f54457093e9c3d2d0e4f6a0cc3c6a454514 /include/configs/ti_armv7_common.h | |
| parent | 998250f78499a97bfa1ec032e31a6485b1e9538d (diff) | |
| download | u-boot-2a77788439ab08409d449fe08419f3a0e3709a3a.tar.xz | |
ti_armv7_common: env: Consolidate support for loading images from mmc
Support for loading images from mmc is duplicated in all TI platforms.
Add this information to DEFAULT_MMC_TI_ARGS so that it can be reused
in all TI platforms.
Reviewed-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/ti_armv7_common.h')
| -rw-r--r-- | include/configs/ti_armv7_common.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 1be8137..a60a32e 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -54,7 +54,8 @@ "ramdisk_addr_r=0x88080000\0" \ "scriptaddr=0x80000000\0" \ "pxefile_addr_r=0x80100000\0" \ - "bootm_size=0x10000000\0" + "bootm_size=0x10000000\0" \ + "boot_fdt=try\0" #define DEFAULT_MMC_TI_ARGS \ "mmcdev=0\0" \ @@ -71,6 +72,8 @@ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ "env import -t ${loadaddr} ${filesize}\0" \ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \ + "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "envboot=mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ @@ -87,6 +90,29 @@ "fi;" \ "fi;" \ "fi;\0" \ + "mmcloados=run args_mmc; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "bootz ${loadaddr} - ${fdtaddr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootz; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootz; " \ + "fi;\0" \ + "mmcboot=mmc dev ${mmcdev}; " \ + "setenv devnum ${mmcdev}; " \ + "setenv devtype mmc; " \ + "if mmc rescan; then " \ + "echo SD/MMC found on device ${mmcdev};" \ + "if run loadimage; then " \ + "run mmcloados;" \ + "fi;" \ + "fi;\0" \ /* * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, |