57a58,70
> if ((p->boot_loader == "") != (p->boot_loader_mem == NULL))
> fatal("If boot_loader is specifed, memory to load it must be also.\n");
>
> if (p->boot_loader != "") {
> bootldr = createObjectFile(p->boot_loader);
>
> if (!bootldr)
> fatal("Could not read bootloader: %s\n", p->boot_loader);
>
> bootldr->loadGlobalSymbols(debugSymbolTable);
>
> }
> debugPrintkEvent = addKernelFuncEvent<DebugPrintkEvent>("dprintk");
71,79c84
< if ((p->boot_loader == "") != (p->boot_loader_mem == NULL))
< fatal("If boot_loader is specifed, memory to load it must be also.\n");
<
< if (p->boot_loader != "") {
< bootldr = createObjectFile(p->boot_loader);
<
< if (!bootldr)
< fatal("Could not read bootloader: %s\n", p->boot_loader);
<
---
> if (bootldr) {
81d85
< bootldr->loadGlobalSymbols(debugSymbolTable);
90d93
< }
92d94
< if (bootldr) {
95a98,100
> if (!p->gic_cpu_addr || !p->flags_addr)
> fatal("gic_cpu_addr && flags_addr must be set with bootloader\n");
>
102,103d106
< if (!p->gic_cpu_addr || !p->flags_addr)
< fatal("gic_cpu_addr && flags_addr must be set with bootloader\n");
107a111
>
114,115d117
<
< debugPrintkEvent = addKernelFuncEvent<DebugPrintkEvent>("dprintk");