diff options
| author | Simon Glass <sjg@chromium.org> | 2013-07-04 13:26:10 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-10 09:15:14 -0400 |
| commit | a5266d6b5d3d94bbbf7fed572a96aa0e90ff4199 (patch) | |
| tree | 9e3081db245b9dbf6704048982131ce807e9253b /common | |
| parent | a26913f32df0d26b94f6c5518d744df5ba6ededb (diff) | |
| download | u-boot-a5266d6b5d3d94bbbf7fed572a96aa0e90ff4199.tar.gz u-boot-a5266d6b5d3d94bbbf7fed572a96aa0e90ff4199.tar.xz u-boot-a5266d6b5d3d94bbbf7fed572a96aa0e90ff4199.zip | |
bootm: Clean up bootz_setup() function
This function has no prototype in the headers and passes void * around, thus
requiring several casts. Tidy this up.
- Add new patch to clean up bootz_setup() function
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 21ab6428a1..3383a8c4c4 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1746,15 +1746,13 @@ static int do_bootm_integrity(int flag, int argc, char * const argv[], #ifdef CONFIG_CMD_BOOTZ -static int __bootz_setup(void *image, void **start, void **end) +int __weak bootz_setup(ulong image, ulong *start, ulong *end) { /* Please define bootz_setup() for your platform */ puts("Your platform's zImage format isn't supported yet!\n"); return -1; } -int bootz_setup(void *image, void **start, void **end) - __attribute__((weak, alias("__bootz_setup"))); /* * zImage booting support @@ -1763,7 +1761,7 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], bootm_headers_t *images) { int ret; - void *zi_start, *zi_end; + ulong zi_start, zi_end; ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, images, 1); @@ -1779,7 +1777,7 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc, images->ep); } - ret = bootz_setup((void *)images->ep, &zi_start, &zi_end); + ret = bootz_setup(images->ep, &zi_start, &zi_end); if (ret != 0) return 1; |