projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed unused CONFIG_L1_INIT_RAM symbol.
[oweals/u-boot.git]
/
lib_avr32
/
bootm.c
diff --git
a/lib_avr32/bootm.c
b/lib_avr32/bootm.c
index a934cae9d98e84820bbe04ea5269bf1853a4bbbe..556e3ea03bd5a81ebb8e520baa1e572d17dc890d 100644
(file)
--- a/
lib_avr32/bootm.c
+++ b/
lib_avr32/bootm.c
@@
-171,29
+171,27
@@
static void setup_end_tag(struct tag *params)
params->hdr.size = 0;
}
params->hdr.size = 0;
}
-void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
- image_header_t *hdr, int verify)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
{
{
- ulong initrd_start, initrd_end;
+ void (*theKernel)(int magic, void *tagtable);
+ struct tag *params, *params_start;
+ char *commandline = getenv("bootargs");
+ int ret;
- void (*theKernel)(int magic, void *tagtable);
- struct tag *params, *params_start;
- char *commandline = getenv("bootargs");
+ if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+ return 1;
- theKernel = (void *)image_get_ep (hdr);
-
- get_ramdisk (cmdtp, flag, argc, argv, hdr, verify,
- IH_ARCH_AVR32, &initrd_start, &initrd_end);
+ theKernel = (void *)images->ep;
show_boot_progress (15);
params = params_start = (struct tag *)gd->bd->bi_boot_params;
params = setup_start_tag(params);
params = setup_memory_tags(params);
show_boot_progress (15);
params = params_start = (struct tag *)gd->bd->bi_boot_params;
params = setup_start_tag(params);
params = setup_memory_tags(params);
- if (i
nit
rd_start) {
+ if (i
mages->
rd_start) {
params = setup_ramdisk_tag(params,
params = setup_ramdisk_tag(params,
- PHYSADDR(i
nit
rd_start),
- PHYSADDR(i
nit
rd_end));
+ PHYSADDR(i
mages->
rd_start),
+ PHYSADDR(i
mages->
rd_end));
}
params = setup_commandline_tag(params, commandline);
params = setup_clock_tags(params);
}
params = setup_commandline_tag(params, commandline);
params = setup_clock_tags(params);
@@
-206,4
+204,7
@@
void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
prepare_to_boot();
theKernel(ATAG_MAGIC, params_start);
prepare_to_boot();
theKernel(ATAG_MAGIC, params_start);
+ /* does not return */
+
+ return 1;
}
}