summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Oreman2009-08-02 23:52:05 +0200
committerMichael Brown2009-08-03 00:19:40 +0200
commitbba00b0c13028a129a6808ca2d09b21871024eaf (patch)
treef72ef30e6eacba56fda997bddae171e4538475ce
parent[pxe] Avoid printf format warning on some compilers (diff)
downloadipxe-bba00b0c13028a129a6808ca2d09b21871024eaf.tar.gz
ipxe-bba00b0c13028a129a6808ca2d09b21871024eaf.tar.xz
ipxe-bba00b0c13028a129a6808ca2d09b21871024eaf.zip
[config] Enable PXE commands by default only on pcbios architecture
The commands bring in UNDI and thus real-mode code, so they cannot be used on EFI. Signed-off-by: Michael Brown <mcb30@etherboot.org>
-rw-r--r--src/config/defaults/pcbios.h2
-rw-r--r--src/config/general.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index f7b8a45c..51d729e2 100644
--- a/src/config/defaults/pcbios.h
+++ b/src/config/defaults/pcbios.h
@@ -25,6 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define IMAGE_BZIMAGE /* Linux bzImage image support */
#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */
+#define PXE_CMD /* PXE commands */
+
#define SANBOOT_PROTO_ISCSI /* iSCSI protocol */
#define SANBOOT_PROTO_AOE /* AoE protocol */
diff --git a/src/config/general.h b/src/config/general.h
index 170ad33a..7422a38a 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -105,7 +105,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define LOGIN_CMD /* Login command */
#undef TIME_CMD /* Time commands */
#undef DIGEST_CMD /* Image crypto digest commands */
-#define PXE_CMD /* PXE commands */
+//#undef PXE_CMD /* PXE commands */
/*
* Obscure configuration options