From f11900a9c6c85b6167a3ad6c6a3efc6c9b8e1686 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Sat, 13 Jan 2007 17:28:51 +0000
Subject: I prefer IMAGE_XXX to XXX_IMAGE.

Add IMAGE_PXE to use the new image format framework.  "kernel pxelinux.0"
now works.
---
 src/core/config.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/core')

diff --git a/src/core/config.c b/src/core/config.c
index 6f113c0bd..b27ad6c1e 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
 
-- 
cgit v1.2.3-55-g7522