diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 14:58:34 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 14:58:34 +0100 |
| commit | 9a4daad0a35eb5143037eea9f786a3e9d672bdd6 (patch) | |
| tree | 69650696145431c6b48d0792b4d6bdf8b714d37a /lib_m68k | |
| parent | e18489e8c27e843e337258fb00f2652ff0f43b92 (diff) | |
[new uImage] Update naming convention for bootm/uImage related code
This patch introduces the following prefix convention for the
image format handling and bootm related code:
genimg_ - dual format shared code
image_ - legacy uImage format specific code
fit_ - new uImage format specific code
boot_ - booting process related code
Related routines are renamed and a few pieces of code are moved around and
re-grouped.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'lib_m68k')
| -rw-r--r-- | lib_m68k/bootm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index e12d1d4aadd..fba7499090d 100644 --- a/lib_m68k/bootm.c +++ b/lib_m68k/bootm.c @@ -82,14 +82,14 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, lmb_reserve(lmb, sp, (CFG_SDRAM_BASE + gd->ram_size - sp)); /* allocate space and init command line */ - ret = get_boot_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base); + ret = boot_get_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base); if (ret) { puts("ERROR with allocation of cmdline\n"); goto error; } /* allocate space for kernel copy of board info */ - ret = get_boot_kbd (lmb, &kbd, bootmap_base); + ret = boot_get_kbd (lmb, &kbd, bootmap_base); if (ret) { puts("ERROR with allocation of kernel bd\n"); goto error; @@ -111,14 +111,15 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))ep; /* find ramdisk */ - ret = get_ramdisk (cmdtp, flag, argc, argv, images, + ret = boot_get_ramdisk (cmdtp, flag, argc, argv, images, IH_ARCH_M68K, &rd_data_start, &rd_data_end); if (ret) goto error; rd_len = rd_data_end - rd_data_start; - ret = ramdisk_high (lmb, rd_data_start, rd_len, &initrd_start, &initrd_end); + ret = boot_ramdisk_high (lmb, rd_data_start, rd_len, + &initrd_start, &initrd_end); if (ret) goto error; |