diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-20 22:14:40 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-20 22:14:40 +0000 |
| commit | 5a9154e06919020dd2588fb1fbb32c1bedb3a79c (patch) | |
| tree | 8cea282b79328d75316bcd2e8aa9c0326a8875e8 /hw/arm_boot.c | |
| parent | 21cafd08a6a56f70a3d943df654d90c9d9e6f38a (diff) | |
| download | qemu-5a9154e06919020dd2588fb1fbb32c1bedb3a79c.tar.gz qemu-5a9154e06919020dd2588fb1fbb32c1bedb3a79c.tar.bz2 qemu-5a9154e06919020dd2588fb1fbb32c1bedb3a79c.zip | |
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
Diffstat (limited to 'hw/arm_boot.c')
| -rw-r--r-- | hw/arm_boot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 765075d913..cf9616ae0b 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -205,8 +205,8 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) kernel_size = load_elf(info->kernel_filename, 0, &elf_entry, NULL, NULL); entry = elf_entry; if (kernel_size < 0) { - kernel_size = load_uboot(info->kernel_filename, &entry, NULL, - &is_linux); + kernel_size = load_uimage(info->kernel_filename, &entry, NULL, + &is_linux); } if (kernel_size < 0) { kernel_size = load_image(info->kernel_filename, |