summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2006-05-25 03:34:13 +0200
committerMichael Brown2006-05-25 03:34:13 +0200
commit0479e9f541f260f865e7d35594cf718cb8fa1e7c (patch)
tree3a6b04efc5a3c20de0d3469d0d8983e7eb6f1e2c
parentRemoved some obsolete INIT_XXX constants. (diff)
downloadipxe-0479e9f541f260f865e7d35594cf718cb8fa1e7c.tar.gz
ipxe-0479e9f541f260f865e7d35594cf718cb8fa1e7c.tar.xz
ipxe-0479e9f541f260f865e7d35594cf718cb8fa1e7c.zip
relocate.o is now dragged in by the objects that require it; there is no
need for a CONFIG_RELOCATE.
-rw-r--r--src/config.h1
-rw-r--r--src/core/config.c9
2 files changed, 0 insertions, 10 deletions
diff --git a/src/config.h b/src/config.h
index ec4b18019..c1293b805 100644
--- a/src/config.h
+++ b/src/config.h
@@ -118,7 +118,6 @@
*
*/
-#define RELOCATE /* Relocate to high memory */
#undef BUILD_SERIAL /* Include an automatic build serial
* number. Add "bs" to the list of
* make targets. For example:
diff --git a/src/core/config.c b/src/core/config.c
index 7756c634e..ce92d90a6 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -137,15 +137,6 @@ REQUIRE_OBJECT ( pc_kbd );
#endif
/*
- * Drag in relocate.o if required
- *
- */
-
-#ifdef RELOCATE
-REQUIRE_OBJECT ( relocate );
-#endif
-
-/*
* Drag in all requested protocols
*
*/