diff options
| author | Simon Glass <sjg@chromium.org> | 2011-10-07 13:53:40 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-17 23:56:57 +0200 |
| commit | 6d6f1236321827e2fcbb1a3b27e61f7c4c4a6814 (patch) | |
| tree | 3ba812fe4dfb88c68b0fff8cea34c3844d4bfbc0 /common/cmd_bootm.c | |
| parent | 6fcc3be4535ac26ce11ba2e0865b615408d3d104 (diff) | |
| download | talos-obmc-uboot-6d6f1236321827e2fcbb1a3b27e61f7c4c4a6814.tar.gz talos-obmc-uboot-6d6f1236321827e2fcbb1a3b27e61f7c4c4a6814.zip | |
sandbox: Add bootm support
This adds sandbox architecture support to bootm, although it is probably
not useful to load sandbox code into the address space and execute it.
This change at least make the file build correctly on 64-bit machines.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index c2e8038ee8..bb9b698d39 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -438,9 +438,8 @@ static int bootm_start_standalone(ulong iflag, int argc, char * const argv[]) setenv("filesize", buf); return 0; } - appl = (int (*)(int, char * const []))ntohl(images.ep); + appl = (int (*)(int, char * const []))(ulong)ntohl(images.ep); (*appl)(argc-1, &argv[1]); - return 0; } @@ -464,14 +463,14 @@ static cmd_tbl_t cmd_bootm_sub[] = { int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int ret = 0; - int state; + long state; cmd_tbl_t *c; boot_os_fn *boot_fn; c = find_cmd_tbl(argv[1], &cmd_bootm_sub[0], ARRAY_SIZE(cmd_bootm_sub)); if (c) { - state = (int)c->cmd; + state = (long)c->cmd; /* treat start special since it resets the state machine */ if (state == BOOTM_STATE_START) { |
