[settings] Add config/settings.h

Move VMWARE_SETTINGS build configuration option from config/sideband.h
to a new config/settings.h.

Existing instances of config/local/sideband.h will not be affected,
since config.c still #includes config/sideband.h.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/config/config.c b/src/config/config.c
index bd1d98856a05d3800e9fa16c26029dbc50f179c0..15d57d1e7d006738684df829d33439924a0003a9 100644 (file)
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -10,6 +10,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <config/general.h>
 #include <config/console.h>
 #include <config/sideband.h>
+#include <config/settings.h>
 
 /** @file
  *
@@ -293,9 +294,13 @@ REQUIRE_OBJECT ( tap );
 REQUIRE_OBJECT ( efi_bofm );
 #endif /* BOFM_EFI */
 #endif /* CONFIG_BOFM */
+
+/*
+ * Drag in relevant settings sources
+ */
 #ifdef VMWARE_SETTINGS
 REQUIRE_OBJECT ( guestinfo );
-#endif /* VMWARE_SETTINGS */
+#endif
 
 /*
  * Drag in selected keyboard map

diff --git a/src/config/settings.h b/src/config/settings.h
new file mode 100644 (file)
index 0000000..331c7e3
--- /dev/null
+++ b/src/config/settings.h
@@ -0,0 +1,16 @@
+#ifndef CONFIG_SETTINGS_H
+#define CONFIG_SETTINGS_H
+
+/** @file
+ *
+ * Configuration settings sources
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+//#define      VMWARE_SETTINGS /* VMware GuestInfo settings */
+
+#include <config/local/settings.h>
+
+#endif /* CONFIG_SETTINGS_H */

diff --git a/src/config/sideband.h b/src/config/sideband.h
index 52339993eb59d4d131d1134efcb4203df47b32cc..2e2a8d41921e478809d66e8a2850f39c24f7ae73 100644 (file)
--- a/src/config/sideband.h
+++ b/src/config/sideband.h
@@ -10,7 +10,6 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 //#define      CONFIG_BOFM     /* IBM's BladeCenter Open Fabric Manager */
-//#define      VMWARE_SETTINGS /* VMware GuestInfo settings */
 
 #include <config/local/sideband.h>