mirror of https://github.com/ipxe/ipxe.git
[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>pull/13/head
parent
d8392851d2
commit
258195242b
|
@ -10,6 +10,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||||
#include <config/general.h>
|
#include <config/general.h>
|
||||||
#include <config/console.h>
|
#include <config/console.h>
|
||||||
#include <config/sideband.h>
|
#include <config/sideband.h>
|
||||||
|
#include <config/settings.h>
|
||||||
|
|
||||||
/** @file
|
/** @file
|
||||||
*
|
*
|
||||||
|
@ -293,9 +294,13 @@ REQUIRE_OBJECT ( tap );
|
||||||
REQUIRE_OBJECT ( efi_bofm );
|
REQUIRE_OBJECT ( efi_bofm );
|
||||||
#endif /* BOFM_EFI */
|
#endif /* BOFM_EFI */
|
||||||
#endif /* CONFIG_BOFM */
|
#endif /* CONFIG_BOFM */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Drag in relevant settings sources
|
||||||
|
*/
|
||||||
#ifdef VMWARE_SETTINGS
|
#ifdef VMWARE_SETTINGS
|
||||||
REQUIRE_OBJECT ( guestinfo );
|
REQUIRE_OBJECT ( guestinfo );
|
||||||
#endif /* VMWARE_SETTINGS */
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Drag in selected keyboard map
|
* Drag in selected keyboard map
|
||||||
|
|
|
@ -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 */
|
|
@ -10,7 +10,6 @@
|
||||||
FILE_LICENCE ( GPL2_OR_LATER );
|
FILE_LICENCE ( GPL2_OR_LATER );
|
||||||
|
|
||||||
//#define CONFIG_BOFM /* IBM's BladeCenter Open Fabric Manager */
|
//#define CONFIG_BOFM /* IBM's BladeCenter Open Fabric Manager */
|
||||||
//#define VMWARE_SETTINGS /* VMware GuestInfo settings */
|
|
||||||
|
|
||||||
#include <config/local/sideband.h>
|
#include <config/local/sideband.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue