blueswirl's latest console-nographic.diff.bz2

git-svn-id: svn://coreboot.org/openbios/openbios-devel@71 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Stefan Reinauer
2006-07-23 14:29:29 +00:00
parent cc29864b60
commit 0726cb7dd7
10 changed files with 273 additions and 86 deletions

View File

@@ -302,7 +302,8 @@ static Elf_Bhdr *build_boot_notes(struct sys_info *info, const char *cmdline)
return bhdr;
}
int elf_load(struct sys_info *info, const char *filename, const char *cmdline)
int elf_load(struct sys_info *info, const char *filename, const char *cmdline,
const void *romvec)
{
Elf_ehdr ehdr;
Elf_phdr *phdr = NULL;
@@ -383,14 +384,8 @@ int elf_load(struct sys_info *info, const char *filename, const char *cmdline)
#if 1
{
extern unsigned int qemu_mem_size;
extern char boot_device;
void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
const void *romvec;
romvec = init_openprom(qemu_mem_size, cmdline, boot_device);
entry = (void *) addr_fixup(ehdr.e_entry);
image_retval = entry(romvec, 0, 0, 0, 0);
}