diff options
| author | Michael Brown <mcb30@etherboot.org> | 2008-10-13 09:37:51 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2008-10-13 09:37:51 +0100 |
| commit | d4e152e7667ce8603c2517b8b0e025e54164d6bd (patch) | |
| tree | b8acf1bfd816e0ec80a56f52334f22afba385717 | |
| parent | 07e8f18f33eba7aef64d7d2cfafc6738f4096b5a (diff) | |
| download | ipxe-d4e152e7667ce8603c2517b8b0e025e54164d6bd.tar.gz | |
[config] Make the default image type selection platform-dependent
| -rw-r--r-- | src/config/defaults/pcbios.h | 7 | ||||
| -rw-r--r-- | src/config/general.h | 22 |
2 files changed, 19 insertions, 10 deletions
diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h index b782647c8..80faef13c 100644 --- a/src/config/defaults/pcbios.h +++ b/src/config/defaults/pcbios.h @@ -15,4 +15,11 @@ #define NAP_PCBIOS #define UMALLOC_MEMTOP +#define IMAGE_ELF /* ELF image support */ +#define IMAGE_MULTIBOOT /* MultiBoot image support */ +#define IMAGE_PXE /* PXE image support */ +#define IMAGE_SCRIPT /* gPXE script image support */ +#define IMAGE_BZIMAGE /* Linux bzImage image support */ +#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ + #endif /* CONFIG_DEFAULTS_PCBIOS_H */ diff --git a/src/config/general.h b/src/config/general.h index 1e6fba343..bf1afd765 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -7,6 +7,8 @@ * */ +#include <config/defaults.h> + /* * Timer configuration * @@ -50,16 +52,16 @@ * you want to use. * */ -#undef IMAGE_NBI /* NBI image support */ -#define IMAGE_ELF /* ELF image support */ -#undef IMAGE_FREEBSD /* FreeBSD kernel image support */ -#define IMAGE_MULTIBOOT /* MultiBoot image support */ -#undef IMAGE_AOUT /* a.out image support */ -#undef IMAGE_WINCE /* WinCE image support */ -#define IMAGE_PXE /* PXE image support */ -#define IMAGE_SCRIPT /* gPXE script image support */ -#define IMAGE_BZIMAGE /* Linux bzImage image support */ -#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ +//#define IMAGE_NBI /* NBI image support */ +//#define IMAGE_ELF /* ELF image support */ +//#define IMAGE_FREEBSD /* FreeBSD kernel image support */ +//#define IMAGE_MULTIBOOT /* MultiBoot image support */ +//#define IMAGE_AOUT /* a.out image support */ +//#define IMAGE_WINCE /* WinCE image support */ +//#define IMAGE_PXE /* PXE image support */ +//#define IMAGE_SCRIPT /* gPXE script image support */ +//#define IMAGE_BZIMAGE /* Linux bzImage image support */ +//#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ /* * Command-line commands to include |