summaryrefslogtreecommitdiffstats
path: root/src/arch
diff options
context:
space:
mode:
authorMichael Brown2007-08-02 15:51:03 +0200
committerMichael Brown2007-08-02 15:51:03 +0200
commit9fd6a0418f38461d6d87f2c88785028d65fd6a1c (patch)
treebfd75ca6c34652464d2e9b02fe4cc06b210e444c /src/arch
parentUse otherwise-useless byte in DHCP feature option as a version number (diff)
downloadipxe-9fd6a0418f38461d6d87f2c88785028d65fd6a1c.tar.gz
ipxe-9fd6a0418f38461d6d87f2c88785028d65fd6a1c.tar.xz
ipxe-9fd6a0418f38461d6d87f2c88785028d65fd6a1c.zip
Allowed zero-cost enforced ordering of features in startup banner
list. Added FEATURE() macros to most relevant (non-driver) files.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/image/bzimage.c3
-rw-r--r--src/arch/i386/image/multiboot.c3
-rw-r--r--src/arch/i386/image/nbi.c3
-rw-r--r--src/arch/i386/image/pxe_image.c3
4 files changed, 12 insertions, 0 deletions
diff --git a/src/arch/i386/image/bzimage.c b/src/arch/i386/image/bzimage.c
index 979eb2d7..8a8b254b 100644
--- a/src/arch/i386/image/bzimage.c
+++ b/src/arch/i386/image/bzimage.c
@@ -36,6 +36,9 @@
#include <gpxe/init.h>
#include <gpxe/initrd.h>
#include <gpxe/cpio.h>
+#include <gpxe/features.h>
+
+FEATURE ( FEATURE_IMAGE, "bzImage", DHCP_EB_FEATURE_BZIMAGE, 1 );
struct image_type bzimage_image_type __image_type ( PROBE_NORMAL );
diff --git a/src/arch/i386/image/multiboot.c b/src/arch/i386/image/multiboot.c
index 546de365..76114130 100644
--- a/src/arch/i386/image/multiboot.c
+++ b/src/arch/i386/image/multiboot.c
@@ -33,6 +33,9 @@
#include <gpxe/memmap.h>
#include <gpxe/elf.h>
#include <gpxe/init.h>
+#include <gpxe/features.h>
+
+FEATURE ( FEATURE_IMAGE, "Multiboot", DHCP_EB_FEATURE_MULTIBOOT, 1 );
struct image_type multiboot_image_type __image_type ( PROBE_MULTIBOOT );
diff --git a/src/arch/i386/image/nbi.c b/src/arch/i386/image/nbi.c
index 2de381d0..a1d74553 100644
--- a/src/arch/i386/image/nbi.c
+++ b/src/arch/i386/image/nbi.c
@@ -10,6 +10,7 @@
#include <gpxe/netdevice.h>
#include <gpxe/dhcp.h>
#include <gpxe/image.h>
+#include <gpxe/features.h>
/** @file
*
@@ -26,6 +27,8 @@
*
*/
+FEATURE ( FEATURE_IMAGE, "NBI", DHCP_EB_FEATURE_NBI, 1 );
+
struct image_type nbi_image_type __image_type ( PROBE_NORMAL );
/**
diff --git a/src/arch/i386/image/pxe_image.c b/src/arch/i386/image/pxe_image.c
index 3da38e09..9e634f14 100644
--- a/src/arch/i386/image/pxe_image.c
+++ b/src/arch/i386/image/pxe_image.c
@@ -29,6 +29,9 @@
#include <gpxe/image.h>
#include <gpxe/segment.h>
#include <gpxe/netdevice.h>
+#include <gpxe/features.h>
+
+FEATURE ( FEATURE_IMAGE, "PXE", DHCP_EB_FEATURE_PXE, 1 );
struct image_type pxe_image_type __image_type ( PROBE_PXE );