diff options
| author | wdenk <wdenk> | 2003-04-12 23:38:12 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-04-12 23:38:12 +0000 |
| commit | 4a6fd34b267dbf4a72080ab9a085bb45c63660fb (patch) | |
| tree | 4ec6a0f355924d61109921b2a1c75b91794f8ba6 /common | |
| parent | 69f8f827d52491f6b89cb8d7cb33810bc7555079 (diff) | |
| download | talos-obmc-uboot-4a6fd34b267dbf4a72080ab9a085bb45c63660fb.tar.gz talos-obmc-uboot-4a6fd34b267dbf4a72080ab9a085bb45c63660fb.zip | |
* Patch by Lutz Dennig, 10 Apr 2003:
Update for R360MPI board
* Add new meaning to "autostart" environment variable:
If set to "no", a standalone image passed to the
"bootm" command will be copied to the load address
(and eventually uncompressed), but NOT be started.
This can be used to load and uncompress arbitrary
data.
* Set max brightness for MN11236 displays on TRAB board
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index f3f9603939..8b32f1cef8 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -287,12 +287,17 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) switch (hdr->ih_type) { case IH_TYPE_STANDALONE: - appl = (int (*)(cmd_tbl_t *, int, int, char *[]))ntohl(hdr->ih_ep); if (iflag) enable_interrupts(); + /* load (and uncompress), but don't start if "autostart" + * is set to "no" + */ + if (((s = getenv("autostart")) != NULL) && (strcmp(s,"no") == 0)) + return 0; + appl = (int (*)(cmd_tbl_t *, int, int, char *[]))ntohl(hdr->ih_ep); (*appl)(cmdtp, flag, argc-1, &argv[1]); - break; + return 0; case IH_TYPE_KERNEL: case IH_TYPE_MULTI: /* handled below */ |
