Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

This patch is revised based on comments. This is the "remove elf and

Browse source 
replace with LAR" series; this set is for arch/x86.


note that the payload is now payload/segment0, payload/segment1, etc. I've extended
linuxbios to look for these. Note that you can now see all the things
that get loaded ;they're no longer hidden in an ELF header somewhere.
Elf failures are gone!

Note that I've left legacy elf support in, for now, but recommend we
get rid of it as soon as possible.

patch attached. This is a first pass. lar.c needs some refactoring but
I want to get the cmdline going. You can now have a linux payload and
it will uncompress with no problems.

This has been tested with filo and BOCHS.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>


git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@482 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Ronald G. Minnich 2007-08-29 15:05:01 +00:00
parent c664a6953a
commit 3d4b4784e5
2 changed files with 55 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/x86/Makefile
View file

@ -22,7 +22,7 @@
ifeq ($(CONFIG_ARCH_X86),y)
INITCFLAGS := $(CFLAGS) -I$(src)/include/arch/x86 -I$(src)/include \
-I$(obj) -fno-builtin
-I$(obj) -fno-builtin
SILENT := >/dev/null 2>&1
@ -78,7 +78,7 @@ else
endif
$(Q)printf " LAR $(subst $(shell pwd)/,,$(@))\n"
$(Q)rm -f $(obj)/linuxbios.rom
$(Q)cd $(obj)/lar.tmp && ../util/lar/lar $(COMPRESSFLAG) -c \
$(Q)cd $(obj)/lar.tmp && ../util/lar/lar $(PARSEELF) $(COMPRESSFLAG) -c \
../linuxbios.rom \
$(LARFILES) \
-s $(ROM_SIZE) -b $(obj)/linuxbios.bootblock
@ -122,6 +122,11 @@ else
endif
endif
ifeq ($(CONFIG_NOELF), y)
PARSEELF = -e
else
PARSEELF =
endif
STAGE0_OBJ := $(patsubst %,$(obj)/lib/%,$(STAGE0_LIB_OBJ)) \
$(patsubst %,$(obj)/arch/x86/%,$(STAGE0_ARCH_X86_OBJ)) \

60
arch/x86/stage1.c
View file

@ -22,12 +22,16 @@
#include <io.h>
#include <console.h>
#include <lar.h>
#include <string.h>
#include <tables.h>
#include <lib.h>
#include <mc146818rtc.h>
#include <post_code.h>
#define UNCOMPRESS_AREA 0x60000
/* ah, well, what a mess! This is a hard code. FIX ME but how?
* By getting rid of ELF ...
*/
#define UNCOMPRESS_AREA (0x400000)
/* these prototypes should go into headers */
void uart_init(void);
@ -48,6 +52,24 @@ static void enable_rom(void)
post_code(0xf2);
}
/* until we get rid of elf */
int legacy(struct mem_file *archive, char *name, void *where, struct lb_memory *mem)
{
int ret;
struct mem_file result;
int elfboot_mem(struct lb_memory *mem, void *where, int size);
ret = copy_file(archive, name, where);
if (ret) {
printk(BIOS_ERR, "'%s' found, but could not load it.\n", name);
}
ret = elfboot_mem(mem, where, result.reallen);
printk(BIOS_ERR, "elfboot_mem returns %d\n", ret);
return -1;
}
/*
* This function is called from assembler code whith its argument on the
* stack. Force the compiler to generate always correct code for this case.
@ -57,6 +79,8 @@ void __attribute__((stdcall)) stage1_main(u32 bist)
int ret;
struct mem_file archive, result;
int elfboot_mem(struct lb_memory *mem, void *where, int size);
void *entry;
int i;
/* we can't statically init this hack. */
unsigned char faker[64];
@ -144,19 +168,31 @@ void __attribute__((stdcall)) stage1_main(u32 bist)
printk(BIOS_DEBUG, "Stage2 code done.\n");
ret = find_file(&archive, "normal/payload", &result);
if (ret) {
printk(BIOS_ERR, "No such file '%s'.\n", "normal/payload");
die("FATAL: No payload found.\n");
}
ret = copy_file(&archive, "normal/payload", (void *)UNCOMPRESS_AREA);
if (ret) {
printk(BIOS_ERR, "'%s' found, but could not load it.\n", "normal/payload");
die("FATAL: No usable payload found.\n");
}
if (! ret)
legacy(&archive, "normal/payload", (void *)UNCOMPRESS_AREA, mem);
ret = elfboot_mem(mem, (void *)UNCOMPRESS_AREA, result.reallen);
printk(BIOS_ERR, "elfboot_mem returns %d\n", ret);
/* new style lar boot. Install all the files in memory.
* By convention we take the entry point from the first
* one. Look for a cmdline as well.
*/
for(i = 0, entry = (void *)0; ;i++) {
char filename[64];
void *newentry;
sprintf(filename, "normal/payload/segment%d", i);
archive.len = *(u32 *)0xfffffff4;
archive.start =(void *)(0UL-archive.len);
newentry = load_file(&archive, filename);
printk("newentry is %p\n", newentry);
if (newentry == (void *)-1)
break;
if (! entry)
entry = newentry;
}
printk(BIOS_SPEW, "all loaded, entry %p\n", entry);
run_address(entry);
die("FATAL: No usable payload found.\n");
die ("FATAL: Last stage returned to LinuxBIOS.\n");
}