diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-06-30 18:00:00 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-08-16 10:08:13 -0600 |
| commit | d7f633fb8fa8127ca1735b40a5089017d613833a (patch) | |
| tree | 4a93033b69774b0fd7d40fed340e5fd84201e4c9 | |
| parent | 0470e3db0c6ddfba370b3eb383585cfe8a2d8aad (diff) | |
OMAP3: Beagle: add back boot.scr support
Removing boot.scr support broke some external bootscripts
that depended on it.
This patch restores boot.scr support but leaves uEnv.txt
support in.
uEnv.txt still works and if both files exist then uEnv.txt
takes precedence.
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | include/configs/omap3_beagle.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a60f61b84..bfaee8f21 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -273,6 +273,10 @@ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t $loadaddr $filesize\0" \ + "bootscr=boot.scr\0" \ + "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ "ramargs=setenv bootargs console=${console} " \ "${optargs} " \ "mpurate=${mpurate} " \ @@ -314,10 +318,13 @@ "if run loadbootenv; then " \ "echo Loaded environment from ${bootenv};" \ "run importbootenv;" \ - "fi;" \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "elif run loadbootscript; then " \ + "echo Loaded script from ${bootscr};" \ + "run bootscript; "\ "fi;" \ "if run loaduimage; then " \ "run mmcboot;" \ |