dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

m68k: Use image_setup_linux() instead of local code

Browse Source 
Rather than having similar code in m68k, use image_setup_linux() which
should be common across all architectures that use the FDT.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2013-05-08 08:06:05 +00:00
committed by Tom Rini
parent 3e51266a4e
commit 24507cf50a
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/m68k/lib/bootm.c
View File

@@ -78,13 +78,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
return 1; return 1;
/* allocate space and init command line */
ret = boot_get_cmdline (lmb, &cmd_start, &cmd_end);
if (ret) {
puts("ERROR with allocation of cmdline\n");
goto error;
}
/* allocate space for kernel copy of board info */ /* allocate space for kernel copy of board info */
ret = boot_get_kbd (lmb, &kbd); ret = boot_get_kbd (lmb, &kbd);
if (ret) { if (ret) {
@@ -93,14 +86,12 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
} }
set_clocks_in_mhz(kbd); set_clocks_in_mhz(kbd);
kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))images->ep; ret = image_setup_linux(images);
rd_len = images->rd_end - images->rd_start;
ret = boot_ramdisk_high (lmb, images->rd_start, rd_len,
&initrd_start, &initrd_end);
if (ret) if (ret)
goto error; goto error;
kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))images->ep;
debug("## Transferring control to Linux (at address %08lx) ...\n", debug("## Transferring control to Linux (at address %08lx) ...\n",
(ulong) kernel); (ulong) kernel);