summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2005-04-18 14:53:39 +0200
committerMichael Brown2005-04-18 14:53:39 +0200
commit451ea7ffc51b5d4662d339605d62e6992ee36a84 (patch)
tree9aa1d15b95989c3c5d497a4eacb60bb300eb438a
parentThis is, of course, the neater and much more obvious way to do it. (diff)
downloadipxe-451ea7ffc51b5d4662d339605d62e6992ee36a84.tar.gz
ipxe-451ea7ffc51b5d4662d339605d62e6992ee36a84.tar.xz
ipxe-451ea7ffc51b5d4662d339605d62e6992ee36a84.zip
Added warning about not using Config for single-object options.
-rw-r--r--src/Config15
-rw-r--r--src/arch/i386/Config21
2 files changed, 32 insertions, 4 deletions
diff --git a/src/Config b/src/Config
index 9ac46c2e0..db5020797 100644
--- a/src/Config
+++ b/src/Config
@@ -1,6 +1,21 @@
+##############################################################################
+##############################################################################
+#
+# IMPORTANT!
+#
+# This file is deprecated. All options are gradually being migrated
+# to config.h. Only options that affect the entire build
+# (e.g. overriding the $(CC) Makefile variable) should be placed in
+# here.
+#
+##############################################################################
+##############################################################################
+
+
#
# Config for Etherboot/32
#
+#
# Do not delete the tag OptionDescription and /OptionDescription
# It is used to automatically generate the documentation.
#
diff --git a/src/arch/i386/Config b/src/arch/i386/Config
index a21265279..da3ab4923 100644
--- a/src/arch/i386/Config
+++ b/src/arch/i386/Config
@@ -1,3 +1,20 @@
+##############################################################################
+##############################################################################
+#
+# IMPORTANT!
+#
+# The use of this file to set options that affect only single object
+# files is deprecated, because changing anything in this file results
+# in a complete rebuild, which is slow. All options are gradually
+# being migrated to config.h, which does not suffer from this problem.
+#
+# Only options that affect the entire build (e.g. overriding the $(CC)
+# Makefile variable) should be placed in here.
+#
+##############################################################################
+##############################################################################
+
+
# Config for i386 Etherboot
#
# Do not delete the tag OptionDescription and /OptionDescription
@@ -99,10 +116,6 @@ CFLAGS+= -DPCBIOS
# LCONFIG+= -DBBS_BUT_NOT_PNP_COMPLIANT
# LCONFIG+= -DBOOT_INT18H
-# Produce code that will work inside the Bochs emulator. The pnic
-# driver is probably the best one to try.
-# CFLAGS+= -DCONFIG_PCI_DIRECT
-
# Produce code that will work with OpenBSD's pxeboot
# CFLAGS+= -DFLATTEN_REAL_MODE