Skip to content

Commit 6ad6af1

Browse files
committed
[build] Canonicalise settings sources configuration
Move all settings source selection from config/defaults/<platform>.h to the top-level config/settings.h, using indented conditional blocks to clarify which sources are supported and enabled on each platform. Signed-off-by: Michael Brown <mcb30@ipxe.org>
1 parent ff80a17 commit 6ad6af1

2 files changed

Lines changed: 21 additions & 9 deletions

File tree

src/config/defaults/efi.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ FILE_SECBOOT ( PERMITTED );
3636
#define USB_EFI /* Provide EFI_USB_IO_PROTOCOL interface */
3737
#define USB_BLOCK /* USB block devices */
3838

39-
#define EFI_SETTINGS /* EFI variable settings */
40-
4139
#if defined ( __i386__ ) || defined ( __x86_64__ )
4240
#define IOAPI_X86
4341
#define ENTROPY_RDRAND

src/config/settings.h

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,27 @@ FILE_SECBOOT ( PERMITTED );
1212

1313
#include <config/defaults.h>
1414

15-
#define PCI_SETTINGS /* PCI device settings */
16-
#define USB_SETTINGS /* USB device settings */
17-
//#define CPUID_SETTINGS /* CPUID settings */
18-
//#define MEMMAP_SETTINGS /* Memory map settings */
19-
//#define VMWARE_SETTINGS /* VMware GuestInfo settings */
20-
//#define VRAM_SETTINGS /* Video RAM dump settings */
21-
//#define ACPI_SETTINGS /* ACPI settings */
15+
/* Settings sources supported on all platforms */
16+
//#define ACPI_SETTINGS /* ACPI settings */
17+
#define PCI_SETTINGS /* PCI device settings */
18+
#define USB_SETTINGS /* USB device settings */
19+
20+
/* Settings sources supported only on EFI platforms */
21+
#if defined ( PLATFORM_efi )
22+
#define EFI_SETTINGS /* EFI variable settings */
23+
#endif
24+
25+
/* Settings sources supported only when memory maps are available */
26+
#if ! defined ( MEMMAP_NULL )
27+
//#define MEMMAP_SETTINGS /* Memory map settings */
28+
#endif
29+
30+
/* Settings sources supported only on x86 CPUs */
31+
#if defined ( __i386__ ) || defined ( __x86_64__ )
32+
//#define CPUID_SETTINGS /* CPUID settings */
33+
//#define VMWARE_SETTINGS /* VMware GuestInfo settings */
34+
//#define VRAM_SETTINGS /* Video RAM dump settings */
35+
#endif
2236

2337
#include <config/named.h>
2438
#include NAMED_CONFIG(settings.h)

0 commit comments

Comments
 (0)