diff options
| author | Michael Brown | 2008-06-09 14:11:46 +0200 |
|---|---|---|
| committer | Michael Brown | 2008-06-09 14:50:00 +0200 |
| commit | 77a5cc6b1391df8aa63589c3b4c5efd2627296e9 (patch) | |
| tree | 5642ceaa317174e15e2f551fa5d0df0edbed7943 /src/core/config.c | |
| parent | [Makefile] Add $(BIN)/undionly.kpxe as default build target (diff) | |
| download | ipxe-77a5cc6b1391df8aa63589c3b4c5efd2627296e9.tar.gz ipxe-77a5cc6b1391df8aa63589c3b4c5efd2627296e9.tar.xz ipxe-77a5cc6b1391df8aa63589c3b4c5efd2627296e9.zip | |
[ELF] Add ability to boot ELF images generated by wraplinux and mkelfImage
Delete ELF as a generic image type. The method for invoking an
ELF-based image (as well as any tables that must be set up to allow it
to boot) will always depend on the specific architecture. core/elf.c
now only provides the elf_load() function, to avoid duplicating
functionality between ELF-based image types.
Add arch/i386/image/elfboot.c, to handle the generic case of 32-bit
x86 ELF images. We don't currently set up any multiboot tables, ELF
notes, etc. This seems to be sufficient for loading kernels generated
using both wraplinux and coreboot's mkelfImage.
Note that while Etherboot 5.4 allowed ELF images to return, we don't.
There is no callback mechanism for the loaded image to shut down gPXE,
which means that we have to shut down before invoking the image. This
means that we lose device state, protection against being trampled on,
etc. It is not safe to continue afterwards.
Diffstat (limited to 'src/core/config.c')
| -rw-r--r-- | src/core/config.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/config.c b/src/core/config.c index 01f709c6..018f084a 100644 --- a/src/core/config.c +++ b/src/core/config.c @@ -131,11 +131,8 @@ REQUIRE_OBJECT ( nmb ); #ifdef IMAGE_NBI REQUIRE_OBJECT ( nbi ); #endif -#ifdef IMAGE_ELF64 -REQUIRE_OBJECT ( elf64 ); -#endif #ifdef IMAGE_ELF -REQUIRE_OBJECT ( elf ); +REQUIRE_OBJECT ( elfboot ); #endif #ifdef IMAGE_FREEBSD REQUIRE_OBJECT ( freebsd ); |