[config] Make the default image type selection platform-dependent
diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index b782647..80faef1 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 1e6fba3..bf1afd7 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
