gwj / at91sam9263 · Commits

Commit 5a9154e06919020dd2588fb1fbb32c1bedb3a79c

Authored by aliguori
1 parent 21cafd08

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
Inline Side-by-side
Showing 6 changed files with 9 additions and 9 deletions
hw/an5206.c
  View file @5a9154e
... ... @@ -68,7 +68,7 @@ static void an5206_init(ram_addr_t ram_size, int vga_ram_size,
68 68 kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
69 69 entry = elf_entry;
70 70 if (kernel_size < 0) {
71   - kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL);
  71 + kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
72 72 }
73 73 if (kernel_size < 0) {
74 74 kernel_size = load_image(kernel_filename,
... ...
hw/arm_boot.c
  View file @5a9154e
... ... @@ -205,8 +205,8 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info)
205 205 kernel_size = load_elf(info->kernel_filename, 0, &elf_entry, NULL, NULL);
206 206 entry = elf_entry;
207 207 if (kernel_size < 0) {
208   - kernel_size = load_uboot(info->kernel_filename, &entry, NULL,
209   - &is_linux);
  208 + kernel_size = load_uimage(info->kernel_filename, &entry, NULL,
  209 + &is_linux);
210 210 }
211 211 if (kernel_size < 0) {
212 212 kernel_size = load_image(info->kernel_filename,
... ...
hw/dummy_m68k.c
  View file @5a9154e
... ... @@ -44,7 +44,7 @@ static void dummy_m68k_init(ram_addr_t ram_size, int vga_ram_size,
44 44 kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
45 45 entry = elf_entry;
46 46 if (kernel_size < 0) {
47   - kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL);
  47 + kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
48 48 }
49 49 if (kernel_size < 0) {
50 50 kernel_size = load_image(kernel_filename,
... ...
hw/mcf5208.c
  View file @5a9154e
... ... @@ -290,7 +290,7 @@ static void mcf5208evb_init(ram_addr_t ram_size, int vga_ram_size,
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);
... ...
loader.c
  View file @5a9154e
... ... @@ -456,8 +456,8 @@ static ssize_t gunzip(void *dst, size_t dstlen, uint8_t *src,
456 456 }
457 457  
458 458 /* Load a U-Boot image. */
459   -int load_uboot(const char *filename, target_ulong *ep, target_ulong *loadaddr,
460   - int *is_linux)
  459 +int load_uimage(const char *filename, target_ulong *ep, target_ulong *loadaddr,
  460 + int *is_linux)
461 461 {
462 462 int fd;
463 463 int size;
... ...
sysemu.h
  View file @5a9154e
... ... @@ -165,8 +165,8 @@ int load_image_targphys(const char *filename, target_phys_addr_t, int max_sz);
165 165 int load_elf(const char *filename, int64_t address_offset,
166 166 uint64_t *pentry, uint64_t *lowaddr, uint64_t *highaddr);
167 167 int load_aout(const char *filename, target_phys_addr_t addr, int max_sz);
168   -int load_uboot(const char *filename, target_ulong *ep, target_ulong *loadaddr,
169   - int *is_linux);
  168 +int load_uimage(const char *filename, target_ulong *ep, target_ulong *loadaddr,
  169 + int *is_linux);
170 170  
171 171 int fread_targphys(target_phys_addr_t dst_addr, size_t nbytes, FILE *f);
172 172 int fread_targphys_ok(target_phys_addr_t dst_addr, size_t nbytes, FILE *f);
... ...