~vcs-imports/qemu/git

« back to all changes in this revision

Viewing changes to hw/mcf5208.c

  • Committer: aliguori
  • Date: 2008-11-20 22:14:40 UTC
  • Revision ID: git-v1:5a9154e06919020dd2588fb1fbb32c1bedb3a79c
uImage: rename load_uboot() to  load_uimage() (Hollis Blanchard)

u-boot is a firmware. uImage is an executable file format.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5764 c046a42c-6fe2-441c-8c8c-71466251a162

Show diffs side-by-side

added added

removed removed

Lines of Context:
290
290
    kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
291
291
    entry = elf_entry;
292
292
    if (kernel_size < 0) {
293
 
        kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL);
 
293
        kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
294
294
    }
295
295
    if (kernel_size < 0) {
296
296
        kernel_size = load_image(kernel_filename, phys_ram_base);