aboutsummaryrefslogtreecommitdiff
path: root/hw/arm_boot.c
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-03-06 23:52:01 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-03-06 23:52:01 +0000
commit1c7b3754f68382941a1921e578ead25d97d116fb (patch)
tree4a2e746c43a4566ee23cd4e3a2358ffb789116b7 /hw/arm_boot.c
parent35f1de319299f043132702c36ebaadfc4a15db69 (diff)
downloadqemu-1c7b3754f68382941a1921e578ead25d97d116fb.zip
qemu-1c7b3754f68382941a1921e578ead25d97d116fb.tar.gz
qemu-1c7b3754f68382941a1921e578ead25d97d116fb.tar.bz2
Simple u-boot image loading support.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2472 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/arm_boot.c')
-rw-r--r--hw/arm_boot.c34
1 files changed, 22 insertions, 12 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index 28f6a92..c313a9f 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -71,7 +71,9 @@ void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
int kernel_size;
int initrd_size;
int n;
- uint64_t entry;
+ int is_linux = 0;
+ uint64_t elf_entry;
+ target_ulong entry;
/* Load the kernel. */
if (!kernel_filename) {
@@ -79,19 +81,27 @@ void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
exit(1);
}
- kernel_size = load_elf(kernel_filename, 0, &entry);
- if (kernel_size >= 0) {
- /* An ELF image. Jump to the entry point. */
+ /* Assume that raw images are linux kernels, and ELF images are not. */
+ kernel_size = load_elf(kernel_filename, 0, &elf_entry);
+ entry = elf_entry;
+ if (kernel_size < 0) {
+ kernel_size = load_uboot(kernel_filename, &entry, &is_linux);
+ }
+ if (kernel_size < 0) {
+ kernel_size = load_image(kernel_filename,
+ phys_ram_base + KERNEL_LOAD_ADDR);
+ entry = KERNEL_LOAD_ADDR;
+ is_linux = 1;
+ }
+ if (kernel_size < 0) {
+ fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
+ exit(1);
+ }
+ if (!is_linux) {
+ /* Jump to the entry point. */
env->regs[15] = entry & 0xfffffffe;
env->thumb = entry & 1;
} else {
- /* Raw binary image. Assume it is a Linux zImage. */
- kernel_size = load_image(kernel_filename,
- phys_ram_base + KERNEL_LOAD_ADDR);
- if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
- exit(1);
- }
if (initrd_filename) {
initrd_size = load_image(initrd_filename,
phys_ram_base + INITRD_LOAD_ADDR);
@@ -106,7 +116,7 @@ void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
bootloader[1] |= board_id & 0xff;
bootloader[2] |= (board_id >> 8) & 0xff;
bootloader[5] = KERNEL_ARGS_ADDR;
- bootloader[6] = KERNEL_LOAD_ADDR;
+ bootloader[6] = entry;
for (n = 0; n < sizeof(bootloader) / 4; n++)
stl_raw(phys_ram_base + (n * 4), bootloader[n]);
set_kernel_args(ram_size, initrd_size, kernel_cmdline);