Browse Source

[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>
tags/v1.20.1
Michael Brown 11 years ago
parent
commit
258195242b
3 changed files with 22 additions and 2 deletions
  1. 6
    1
      src/config/config.c
  2. 16
    0
      src/config/settings.h
  3. 0
    1
      src/config/sideband.h

+ 6
- 1
src/config/config.c View File

10
 #include <config/general.h>
10
 #include <config/general.h>
11
 #include <config/console.h>
11
 #include <config/console.h>
12
 #include <config/sideband.h>
12
 #include <config/sideband.h>
13
+#include <config/settings.h>
13
 
14
 
14
 /** @file
15
 /** @file
15
  *
16
  *
293
 REQUIRE_OBJECT ( efi_bofm );
294
 REQUIRE_OBJECT ( efi_bofm );
294
 #endif /* BOFM_EFI */
295
 #endif /* BOFM_EFI */
295
 #endif /* CONFIG_BOFM */
296
 #endif /* CONFIG_BOFM */
297
+
298
+/*
299
+ * Drag in relevant settings sources
300
+ */
296
 #ifdef VMWARE_SETTINGS
301
 #ifdef VMWARE_SETTINGS
297
 REQUIRE_OBJECT ( guestinfo );
302
 REQUIRE_OBJECT ( guestinfo );
298
-#endif /* VMWARE_SETTINGS */
303
+#endif
299
 
304
 
300
 /*
305
 /*
301
  * Drag in selected keyboard map
306
  * Drag in selected keyboard map

+ 16
- 0
src/config/settings.h View File

1
+#ifndef CONFIG_SETTINGS_H
2
+#define CONFIG_SETTINGS_H
3
+
4
+/** @file
5
+ *
6
+ * Configuration settings sources
7
+ *
8
+ */
9
+
10
+FILE_LICENCE ( GPL2_OR_LATER );
11
+
12
+//#define	VMWARE_SETTINGS	/* VMware GuestInfo settings */
13
+
14
+#include <config/local/settings.h>
15
+
16
+#endif /* CONFIG_SETTINGS_H */

+ 0
- 1
src/config/sideband.h View File

10
 FILE_LICENCE ( GPL2_OR_LATER );
10
 FILE_LICENCE ( GPL2_OR_LATER );
11
 
11
 
12
 //#define	CONFIG_BOFM	/* IBM's BladeCenter Open Fabric Manager */
12
 //#define	CONFIG_BOFM	/* IBM's BladeCenter Open Fabric Manager */
13
-//#define	VMWARE_SETTINGS	/* VMware GuestInfo settings */
14
 
13
 
15
 #include <config/local/sideband.h>
14
 #include <config/local/sideband.h>
16
 
15
 

Loading…
Cancel
Save