From 524998eb1ab1b83d6f38f1ddee986791c7f6376b Mon Sep 17 00:00:00 2001 From: John Rigby Date: Thu, 30 Jun 2011 18:00:00 +0100 Subject: OMAP3: Beagle: add back boot.scr support uEnv.txt still works but so does boot.scr Signed-off-by: John Rigby --- include/configs/omap3_beagle.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 9fd80ed50..ea3855beb 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -226,6 +226,9 @@ "omapdss.def_disp=${defaultdisplay} " \ "root=${nandroot} " \ "rootfstype=${nandrootfstype}\0" \ + "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source ${loadaddr}\0" \ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t $loadaddr $filesize\0" \ @@ -241,7 +244,9 @@ #define CONFIG_BOOTCOMMAND \ "if mmc rescan ${mmcdev}; then " \ "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootenv; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "elif run loadbootenv; then " \ "run importbootenv;" \ "fi;" \ "if test -n $uenvcmd; then " \ -- cgit v1.2.3