From 18c534bbfbe9355fc5373547f4f89384a29da516 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Wed, 9 Mar 2016 15:39:35 +0530 Subject: 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 Reviewed-by: Tom Rini --- include/configs/am43xx_evm.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'include/configs/am43xx_evm.h') diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 0a96bd3b6e..b982ed69fa 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -259,10 +259,6 @@ "${optargs} " \ "root=${usbroot} " \ "rootfstype=${usbrootfstype}\0" \ - "bootenv=uEnv.txt\0" \ - "loadbootenv=load ${devtype} ${devnum} ${loadaddr} ${bootenv}\0" \ - "importbootenv=echo Importing environment from mmc ...; " \ - "env import -t $loadaddr $filesize\0" \ "ramargs=setenv bootargs console=${console} " \ "${optargs} " \ "root=${ramroot} " \ @@ -275,14 +271,6 @@ "setenv devtype mmc; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${devnum};" \ - "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 loadfdt; " \ "echo Booting from mmc${mmcdev} ...; " \ @@ -329,6 +317,7 @@ #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ + "run envboot;" \ "run mmcboot;" \ "run usbboot;" \ NANDBOOT \ -- cgit v1.2.3