OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/mips/boston: Allow loading elf kernel and dtb

Browse Source 
ELF kernel allows us debugging much easier with DWARF symbols.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMD: Fix coding style]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211002184539.169-3-jiaxun.yang@flygoat.com>
This commit is contained in:
Jiaxun Yang 2021-10-02 19:45:38 +01:00 committed by Philippe Mathieu-Daudé
parent e07f3e265b
commit 10e3f30ff7
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/mips/boston.c
View File

@ -20,6 +20,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h" #include "qemu/units.h"
#include "elf.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/ide/pci.h" #include "hw/ide/pci.h"
@ -551,11 +552,38 @@ static void boston_mach_init(MachineState *machine)
exit(1); exit(1);
} }
} else if (machine->kernel_filename) { } else if (machine->kernel_filename) {
uint64_t kernel_entry, kernel_high, kernel_size;
kernel_size = load_elf(machine->kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL,
&kernel_entry, NULL, &kernel_high,
NULL, 0, EM_MIPS, 1, 0);
if (kernel_size) {
hwaddr dtb_paddr = QEMU_ALIGN_UP(kernel_high, 64 * KiB);
hwaddr dtb_vaddr = cpu_mips_phys_to_kseg0(NULL, dtb_paddr);
s->kernel_entry = kernel_entry;
if (machine->dtb) {
int dt_size;
g_autofree const void *dtb_file_data, *dtb_load_data;
dtb_file_data = load_device_tree(machine->dtb, &dt_size);
dtb_load_data = boston_fdt_filter(s, dtb_file_data,
NULL, &dtb_vaddr);
/* Calculate real fdt size after filter */
dt_size = fdt_totalsize(dtb_load_data);
rom_add_blob_fixed("dtb", dtb_load_data, dt_size, dtb_paddr);
}
} else {
/* Try to load file as FIT */
fit_err = load_fit(&boston_fit_loader, machine->kernel_filename, s); fit_err = load_fit(&boston_fit_loader, machine->kernel_filename, s);
if (fit_err) { if (fit_err) {
error_report("unable to load FIT image"); error_report("unable to load kernel image");
exit(1); exit(1);
} }
}
gen_firmware(memory_region_get_ram_ptr(flash) + 0x7c00000, gen_firmware(memory_region_get_ram_ptr(flash) + 0x7c00000,
s->kernel_entry, s->fdt_base); s->kernel_entry, s->fdt_base);