diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2016-03-09 15:39:35 +0530 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-15 21:30:17 -0400 |
| commit | 18c534bbfbe9355fc5373547f4f89384a29da516 (patch) | |
| tree | 9d92c14c0dc5fad3fc2a896f30feaa7b1b02bce1 /include/configs/am335x_evm.h | |
| parent | 592bc5e2696b681715f9a937d7ca0949d613f816 (diff) | |
| download | talos-obmc-uboot-18c534bbfbe9355fc5373547f4f89384a29da516.tar.gz talos-obmc-uboot-18c534bbfbe9355fc5373547f4f89384a29da516.zip | |
ti_armv7_common: env: Consolidate support for loading script and text env files
Support for loading bootscript and text env file is duplicated in all TI
platforms. Add this information to DEFAULT_MMC_TI_ARGS so that it can be
reused in all TI platforms.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/am335x_evm.h')
| -rw-r--r-- | include/configs/am335x_evm.h | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 35f2146706..150c5235d2 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -91,6 +91,7 @@ #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ + "run envboot; " \ "run distro_bootcmd" #include <config_distro_bootcmd.h> @@ -120,13 +121,6 @@ "${optargs} " \ "root=${spiroot} " \ "rootfstype=${spirootfstype}\0" \ - "bootenv=uEnv.txt\0" \ - "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ - "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ - "source ${loadaddr}\0" \ - "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ - "importbootenv=echo Importing environment from mmc ...; " \ - "env import -t -r $loadaddr $filesize\0" \ "ramargs=setenv bootargs console=${console} " \ "${optargs} " \ "root=${ramroot} " \ @@ -151,21 +145,10 @@ "mmcboot=mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootscript; then " \ - "run bootscript;" \ - "else " \ - "if run loadbootenv; then " \ - "echo Loaded environment from ${bootenv};" \ - "run importbootenv;" \ - "fi;" \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "if run loadimage; then " \ - "run mmcloados;" \ - "fi;" \ - "fi ;" \ + "run envboot; " \ + "if run loadimage; then " \ + "run mmcloados;" \ + "fi;" \ "fi;\0" \ "spiboot=echo Booting from spi ...; " \ "run spiargs; " \ @@ -197,7 +180,6 @@ BOOTENV #endif - /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ |
