diff options
| author | Simon Glass <sjg@chromium.org> | 2013-05-08 08:06:05 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-14 15:37:26 -0400 |
| commit | 24507cf50aa7438649bc4fafe80fb2eb0bf9dd90 (patch) | |
| tree | c87f1264fffd5a45da9faf992ff7e05015894e71 /arch/m68k | |
| parent | 3e51266a4e530026c002e210754c737a0caaa050 (diff) | |
m68k: Use image_setup_linux() instead of local code
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>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/lib/bootm.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index d506d0cc770..56b6512be05 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -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)) 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 */ ret = boot_get_kbd (lmb, &kbd); 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); - kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))images->ep; - - rd_len = images->rd_end - images->rd_start; - ret = boot_ramdisk_high (lmb, images->rd_start, rd_len, - &initrd_start, &initrd_end); + ret = image_setup_linux(images); if (ret) goto error; + kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))images->ep; + debug("## Transferring control to Linux (at address %08lx) ...\n", (ulong) kernel); |