diff options
| author | Michael Brown | 2009-02-16 01:28:30 +0100 |
|---|---|---|
| committer | Michael Brown | 2009-02-16 01:30:36 +0100 |
| commit | 076154a1c6ca987f84450c0225c190c9cdd77c59 (patch) | |
| tree | fbe8e2e7ccbd9de5f048894f9a58687df0c975de /src/include | |
| parent | [romprefix] Update ROM checksum even if PMM allocation fails (diff) | |
| download | ipxe-076154a1c6ca987f84450c0225c190c9cdd77c59.tar.gz ipxe-076154a1c6ca987f84450c0225c190c9cdd77c59.tar.xz ipxe-076154a1c6ca987f84450c0225c190c9cdd77c59.zip | |
[image] Allow multiple embedded images
This patch extends the embedded image feature to allow multiple
embedded images instead of just one.
gPXE now always boots the first embedded image on startup instead of
doing the hardcoded DHCP boot (aka autoboot).
Based heavily upon a patch by Stefan Hajnoczi <stefanha@gmail.com>.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/gpxe/embedded.h | 9 | ||||
| -rw-r--r-- | src/include/gpxe/errfile.h | 1 | ||||
| -rw-r--r-- | src/include/gpxe/uri.h | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/include/gpxe/embedded.h b/src/include/gpxe/embedded.h deleted file mode 100644 index ec457055f..000000000 --- a/src/include/gpxe/embedded.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _GPXE_EMBEDDED_H -#define _GPXE_EMBEDDED_H - -#include <gpxe/image.h> - -struct image *embedded_image(void); - -#endif - diff --git a/src/include/gpxe/errfile.h b/src/include/gpxe/errfile.h index 4809e50c9..90c21a7e3 100644 --- a/src/include/gpxe/errfile.h +++ b/src/include/gpxe/errfile.h @@ -145,6 +145,7 @@ #define ERRFILE_script ( ERRFILE_IMAGE | 0x00020000 ) #define ERRFILE_segment ( ERRFILE_IMAGE | 0x00030000 ) #define ERRFILE_efi_image ( ERRFILE_IMAGE | 0x00040000 ) +#define ERRFILE_embedded ( ERRFILE_IMAGE | 0x00050000 ) #define ERRFILE_asn1 ( ERRFILE_OTHER | 0x00000000 ) #define ERRFILE_chap ( ERRFILE_OTHER | 0x00010000 ) diff --git a/src/include/gpxe/uri.h b/src/include/gpxe/uri.h index 37f3aac95..3803868d2 100644 --- a/src/include/gpxe/uri.h +++ b/src/include/gpxe/uri.h @@ -7,6 +7,7 @@ * */ +#include <stddef.h> #include <stdlib.h> #include <gpxe/refcnt.h> |