diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-06-29 00:59:23 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-06-30 11:54:29 +0100 |
| commit | aaaedc32835a43fe1bd4bb5fcd3740303798c05a (patch) | |
| tree | dd3f1a0eaf0192643221ac552ffb8000498493d6 | |
| parent | c4c86969651440cd9e0ee26ead012a9045012a0d (diff) | |
Revert "omap3_beagle: enable the use of a plain text file"
This reverts commit cf073e49bc3502be1b48a0e3faf0cde9edbb89db.
| -rw-r--r-- | include/configs/omap3_beagle.h | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 9fd80ed50..a8ff73e81 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -226,9 +226,9 @@ "omapdss.def_disp=${defaultdisplay} " \ "root=${nandroot} " \ "rootfstype=${nandrootfstype}\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ - "importbootenv=echo Importing environment from mmc ...; " \ - "env import -t $loadaddr $filesize\0" \ + "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source ${loadaddr}\0" \ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ @@ -240,19 +240,15 @@ #define CONFIG_BOOTCOMMAND \ "if mmc rescan ${mmcdev}; then " \ - "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootenv; then " \ - "run importbootenv;" \ - "fi;" \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "if run loaduimage; then " \ - "run mmcboot;" \ - "fi;" \ - "fi;" \ - "run nandboot;" \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else run nandboot; " \ + "fi; " \ + "fi; " \ + "else run nandboot; fi" #define CONFIG_AUTO_COMPLETE 1 /* |