david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM ELF loader.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2320 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2007-01-16 18:54:31 +00:00
parent 5856de800d
commit daf90626be
5 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/arm_boot.c
View File

@ -64,19 +64,28 @@ static void set_kernel_args(uint32_t ram_size, int initrd_size,
stl_raw(p++, 0); stl_raw(p++, 0);
} }
void arm_load_kernel(int ram_size, const char *kernel_filename, void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
const char *kernel_cmdline, const char *initrd_filename, const char *kernel_cmdline, const char *initrd_filename,
int board_id) int board_id)
{ {
int kernel_size; int kernel_size;
int initrd_size; int initrd_size;
int n; int n;
uint64_t entry;
/* Load the kernel. */ /* Load the kernel. */
if (!kernel_filename) { if (!kernel_filename) {
fprintf(stderr, "Kernel image must be specified\n"); fprintf(stderr, "Kernel image must be specified\n");
exit(1); exit(1);
} }
kernel_size = load_elf(kernel_filename, 0, &entry);
if (kernel_size) {
/* An ELF image. Jump to the entry point. */
env->regs[15] = entry & 0xfffffffe;
env->thumb = entry & 1;
} else {
/* Raw binary image. Assume it is a Limux zImage. */
kernel_size = load_image(kernel_filename, kernel_size = load_image(kernel_filename,
phys_ram_base + KERNEL_LOAD_ADDR); phys_ram_base + KERNEL_LOAD_ADDR);
if (kernel_size < 0) { if (kernel_size < 0) {
@ -101,5 +110,6 @@ void arm_load_kernel(int ram_size, const char *kernel_filename,
for (n = 0; n < sizeof(bootloader) / 4; n++) for (n = 0; n < sizeof(bootloader) / 4; n++)
stl_raw(phys_ram_base + (n * 4), bootloader[n]); stl_raw(phys_ram_base + (n * 4), bootloader[n]);
set_kernel_args(ram_size, initrd_size, kernel_cmdline); set_kernel_args(ram_size, initrd_size, kernel_cmdline);
}
} }

2
hw/integratorcp.c
View File

@ -509,7 +509,7 @@ static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device,
} }
pl110_init(ds, 0xc0000000, pic, 22, 0); pl110_init(ds, 0xc0000000, pic, 22, 0);
arm_load_kernel(ram_size, kernel_filename, kernel_cmdline, arm_load_kernel(env, ram_size, kernel_filename, kernel_cmdline,
initrd_filename, 0x113); initrd_filename, 0x113);
} }

2
hw/realview.c
View File

@ -127,7 +127,7 @@ static void realview_init(int ram_size, int vga_ram_size, int boot_device,
/* 0x68000000 PCI mem 1. */ /* 0x68000000 PCI mem 1. */
/* 0x6c000000 PCI mem 2. */ /* 0x6c000000 PCI mem 2. */
arm_load_kernel(ram_size, kernel_filename, kernel_cmdline, arm_load_kernel(env, ram_size, kernel_filename, kernel_cmdline,
initrd_filename, 0x33b); initrd_filename, 0x33b);
} }

2
hw/versatilepb.c
View File

@ -250,7 +250,7 @@ static void versatile_init(int ram_size, int vga_ram_size, int boot_device,
/* 0x101f3000 UART2. */ /* 0x101f3000 UART2. */
/* 0x101f4000 SSPI. */ /* 0x101f4000 SSPI. */
arm_load_kernel(ram_size, kernel_filename, kernel_cmdline, arm_load_kernel(env, ram_size, kernel_filename, kernel_cmdline,
initrd_filename, board_id); initrd_filename, board_id);
} }

2
vl.h
View File

@ -1317,7 +1317,7 @@ void *arm_gic_init(uint32_t base, void *parent, int parent_irq);
/* arm_boot.c */ /* arm_boot.c */
void arm_load_kernel(int ram_size, const char *kernel_filename, void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
const char *kernel_cmdline, const char *initrd_filename, const char *kernel_cmdline, const char *initrd_filename,
int board_id); int board_id);