Browse Source

[config] Make the default image type selection platform-dependent

tags/v0.9.6
Michael Brown 15 years ago
parent
commit
d4e152e766
2 changed files with 19 additions and 10 deletions
  1. 7
    0
      src/config/defaults/pcbios.h
  2. 12
    10
      src/config/general.h

+ 7
- 0
src/config/defaults/pcbios.h View File

@@ -15,4 +15,11 @@
15 15
 #define NAP_PCBIOS
16 16
 #define UMALLOC_MEMTOP
17 17
 
18
+#define	IMAGE_ELF		/* ELF image support */
19
+#define	IMAGE_MULTIBOOT		/* MultiBoot image support */
20
+#define	IMAGE_PXE		/* PXE image support */
21
+#define IMAGE_SCRIPT		/* gPXE script image support */
22
+#define IMAGE_BZIMAGE		/* Linux bzImage image support */
23
+#define IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
24
+
18 25
 #endif /* CONFIG_DEFAULTS_PCBIOS_H */

+ 12
- 10
src/config/general.h View File

@@ -7,6 +7,8 @@
7 7
  *
8 8
  */
9 9
 
10
+#include <config/defaults.h>
11
+
10 12
 /*
11 13
  * Timer configuration
12 14
  *
@@ -50,16 +52,16 @@
50 52
  * you want to use.
51 53
  *
52 54
  */
53
-#undef	IMAGE_NBI		/* NBI image support */
54
-#define	IMAGE_ELF		/* ELF image support */
55
-#undef	IMAGE_FREEBSD		/* FreeBSD kernel image support */
56
-#define	IMAGE_MULTIBOOT		/* MultiBoot image support */
57
-#undef	IMAGE_AOUT		/* a.out image support */
58
-#undef	IMAGE_WINCE		/* WinCE image support */
59
-#define	IMAGE_PXE		/* PXE image support */
60
-#define IMAGE_SCRIPT		/* gPXE script image support */
61
-#define IMAGE_BZIMAGE		/* Linux bzImage image support */
62
-#define IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
55
+//#define	IMAGE_NBI		/* NBI image support */
56
+//#define	IMAGE_ELF		/* ELF image support */
57
+//#define	IMAGE_FREEBSD		/* FreeBSD kernel image support */
58
+//#define	IMAGE_MULTIBOOT		/* MultiBoot image support */
59
+//#define	IMAGE_AOUT		/* a.out image support */
60
+//#define	IMAGE_WINCE		/* WinCE image support */
61
+//#define	IMAGE_PXE		/* PXE image support */
62
+//#define	IMAGE_SCRIPT		/* gPXE script image support */
63
+//#define	IMAGE_BZIMAGE		/* Linux bzImage image support */
64
+//#define	IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
63 65
 
64 66
 /*
65 67
  * Command-line commands to include

Loading…
Cancel
Save