diff options
| author | Michael Brown | 2007-01-13 18:28:51 +0100 |
|---|---|---|
| committer | Michael Brown | 2007-01-13 18:28:51 +0100 |
| commit | f11900a9c6c85b6167a3ad6c6a3efc6c9b8e1686 (patch) | |
| tree | 2c27f878393b052239b7285042f712bb09b8e946 /src/core/config.c | |
| parent | Add header for pxe_boot() (diff) | |
| download | ipxe-f11900a9c6c85b6167a3ad6c6a3efc6c9b8e1686.tar.gz ipxe-f11900a9c6c85b6167a3ad6c6a3efc6c9b8e1686.tar.xz ipxe-f11900a9c6c85b6167a3ad6c6a3efc6c9b8e1686.zip | |
I prefer IMAGE_XXX to XXX_IMAGE.
Add IMAGE_PXE to use the new image format framework. "kernel pxelinux.0"
now works.
Diffstat (limited to 'src/core/config.c')
| -rw-r--r-- | src/core/config.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/config.c b/src/core/config.c index 6f113c0b..b27ad6c1 100644 --- a/src/core/config.c +++ b/src/core/config.c @@ -110,34 +110,34 @@ REQUIRE_OBJECT ( nmb ); * Drag in all requested image formats * */ -#ifdef TAGGED_IMAGE +#ifdef IMAGE_NBI REQUIRE_OBJECT ( nbi ); #endif -#ifdef ELF64_IMAGE +#ifdef IMAGE_ELF64 REQUIRE_OBJECT ( elf64 ); #endif -#ifdef ELF_IMAGE +#ifdef IMAGE_ELF REQUIRE_OBJECT ( elf ); #endif -#ifdef COFF_IMAGE +#ifdef IMAGE_ELF REQUIRE_OBJECT ( coff ); #endif -#ifdef FREEBSD_IMAGE +#ifdef IMAGE_FREEBSD REQUIRE_OBJECT ( freebsd ); #endif -#ifdef MULTIBOOT_IMAGE +#ifdef IMAGE_MULTIBOOT REQUIRE_OBJECT ( multiboot ); #endif -#ifdef AOUT_IMAGE +#ifdef IMAGE_AOUT REQUIRE_OBJECT ( aout ); #endif -#ifdef WINCE_IMAGE +#ifdef IMAGE_WINCE REQUIRE_OBJECT ( wince ); #endif -#ifdef PXE_IMAGE -REQUIRE_OBJECT ( pxe ); +#ifdef IMAGE_PXE +REQUIRE_OBJECT ( pxe_image ); #endif -#ifdef SCRIPT_IMAGE +#ifdef IMAGE_SCRIPT REQUIRE_OBJECT ( script ); #endif |