david/ipxe
david
/
ipxe
Archived
1
0
Fork 0

[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>
This commit is contained in:
Michael Brown 2013-07-09 16:01:52 +01:00
parent d8392851d2
commit 258195242b
3 changed files with 22 additions and 2 deletions

View File

@ -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

16
src/config/settings.h Normal file
View File

@ -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 */

View File

@ -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>