From: Michael Brown Date: Thu, 29 Mar 2012 00:24:31 +0000 (+0100) Subject: [comboot] Remove COMBOOT image support by default X-Git-Tag: v1.20.1~1865 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf0953a1b09d004f5de5fb617f9a16b17adcb0c0;p=thirdparty%2Fipxe.git [comboot] Remove COMBOOT image support by default iPXE's support for COMBOOT images is now quite outdated; it has not kept up to date with changes in the COMBOOT API. The primary use for COMBOOT seems to be for menuing support. Now that we have native iPXE script-based menus, COMBOOT support can be gracefully retired (with immense thanks to Daniel Verkamp for having successfully implemented such an ambitious feature many years ago). Signed-off-by: Michael Brown --- diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h index 9092d6751..b68186f1b 100644 --- a/src/config/defaults/pcbios.h +++ b/src/config/defaults/pcbios.h @@ -26,7 +26,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define IMAGE_PXE /* PXE image support */ #define IMAGE_SCRIPT /* iPXE script image support */ #define IMAGE_BZIMAGE /* Linux bzImage image support */ -#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ #define PXE_STACK /* PXE stack in iPXE - required for PXELINUX */ #define PXE_MENU /* PXE menu booting */