[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/4] uImage: rename load_uboot() to load_uimage()
From: |
Hollis Blanchard |
Subject: |
[Qemu-devel] [PATCH 4/4] uImage: rename load_uboot() to load_uimage() |
Date: |
Mon, 17 Nov 2008 15:18:12 -0600 |
u-boot is a bootloader. uImage is an executable file format.
Signed-off-by: Hollis Blanchard <address@hidden>
---
hw/an5206.c | 2 +-
hw/arm_boot.c | 4 ++--
hw/dummy_m68k.c | 2 +-
hw/mcf5208.c | 2 +-
loader.c | 4 ++--
patches | 1 +
sysemu.h | 4 ++--
7 files changed, 10 insertions(+), 9 deletions(-)
create mode 120000 patches
diff --git a/hw/an5206.c b/hw/an5206.c
index bb9cde1..98f35e3 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -68,7 +68,7 @@ static void an5206_init(ram_addr_t ram_size, int vga_ram_size,
kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
entry = elf_entry;
if (kernel_size < 0) {
- kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL);
+ kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
}
if (kernel_size < 0) {
kernel_size = load_image(kernel_filename,
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index 765075d..cf9616a 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,
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 5cd5358..7931b6d 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -44,7 +44,7 @@ static void dummy_m68k_init(ram_addr_t ram_size, int
vga_ram_size,
kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
entry = elf_entry;
if (kernel_size < 0) {
- kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL);
+ kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
}
if (kernel_size < 0) {
kernel_size = load_image(kernel_filename,
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 82db38d..f9ae588 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -290,7 +290,7 @@ static void mcf5208evb_init(ram_addr_t ram_size, int
vga_ram_size,
kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
entry = elf_entry;
if (kernel_size < 0) {
- kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL);
+ kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
}
if (kernel_size < 0) {
kernel_size = load_image(kernel_filename, phys_ram_base);
diff --git a/loader.c b/loader.c
index 9ad3c96..dd8f92d 100644
--- a/loader.c
+++ b/loader.c
@@ -432,8 +432,8 @@ static ssize_t gunzip(void *dst, size_t dstlen, uint8_t
*src,
}
/* Load a U-Boot image. */
-int load_uboot(const char *filename, target_ulong *ep, target_ulong *loadaddr,
- int *is_linux)
+int load_uimage(const char *filename, target_ulong *ep, target_ulong *loadaddr,
+ int *is_linux)
{
int fd;
int size;
diff --git a/patches b/patches
new file mode 120000
index 0000000..848fc19
--- /dev/null
+++ b/patches
@@ -0,0 +1 @@
+.git/patches/master
\ No newline at end of file
diff --git a/sysemu.h b/sysemu.h
index d3d3203..f72ec96 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -165,8 +165,8 @@ int load_image_targphys(const char *filename,
target_phys_addr_t, int max_sz);
int load_elf(const char *filename, int64_t address_offset,
uint64_t *pentry, uint64_t *lowaddr, uint64_t *highaddr);
int load_aout(const char *filename, target_phys_addr_t addr, int max_sz);
-int load_uboot(const char *filename, target_ulong *ep, target_ulong *loadaddr,
- int *is_linux);
+int load_uimage(const char *filename, target_ulong *ep, target_ulong *loadaddr,
+ int *is_linux);
int fread_targphys(target_phys_addr_t dst_addr, size_t nbytes, FILE *f);
int fread_targphys_ok(target_phys_addr_t dst_addr, size_t nbytes, FILE *f);
--
1.5.6.5
- [Qemu-devel] improvements in uImage loading, Hollis Blanchard, 2008/11/17
- [Qemu-devel] [PATCH 1/4] uImage: free file data after copying into guest memory, Hollis Blanchard, 2008/11/17
- Re: [Qemu-devel] [PATCH 2/4] uImage: implement gzip support, Jean-Christophe PLAGNIOL-VILLARD, 2008/11/17
- Re: [Qemu-devel] [PATCH 2/4] uImage: implement gzip support, François Revol, 2008/11/17
- Re: [Qemu-devel] [PATCH 2/4] uImage: implement gzip support, Jean-Christophe PLAGNIOL-VILLARD, 2008/11/17
- Re: [Qemu-devel] [PATCH 2/4] uImage: implement gzip support, François Revol, 2008/11/17
- Re: [Qemu-devel] [PATCH 2/4] uImage: implement gzip support, Hollis Blanchard, 2008/11/17
- Re: [Qemu-devel] [PATCH 2/4] uImage: implement gzip support, Jean-Christophe PLAGNIOL-VILLARD, 2008/11/17
- Re: [Qemu-devel] [PATCH 2/4] uImage: implement gzip support, Hollis Blanchard, 2008/11/18
- Re: [Qemu-devel] [PATCH 2/4] uImage: implement gzip support, Anthony Liguori, 2008/11/18