sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-22 03:32:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

[build] Canonicalise settings sources configuration

Browse Source 
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>
This commit is contained in:
Michael Brown
2026-01-16 15:27:26 +00:00
parent ff80a1758f
commit 6ad6af198e
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/defaults/efi.h
View File

@@ -36,8 +36,6 @@ FILE_SECBOOT ( PERMITTED );
#define USB_EFI /* Provide EFI_USB_IO_PROTOCOL interface */ #define USB_EFI /* Provide EFI_USB_IO_PROTOCOL interface */
#define USB_BLOCK /* USB block devices */ #define USB_BLOCK /* USB block devices */
#define EFI_SETTINGS /* EFI variable settings */
#if defined ( __i386__ ) || defined ( __x86_64__ ) #if defined ( __i386__ ) || defined ( __x86_64__ )
#define IOAPI_X86 #define IOAPI_X86
#define ENTROPY_RDRAND #define ENTROPY_RDRAND

28
src/config/settings.h
View File

@@ -12,13 +12,27 @@ FILE_SECBOOT ( PERMITTED );
#include <config/defaults.h> #include <config/defaults.h>
#define PCI_SETTINGS /* PCI device settings */ /* Settings sources supported on all platforms */
#define USB_SETTINGS /* USB device settings */ //#define ACPI_SETTINGS /* ACPI settings */
//#define CPUID_SETTINGS /* CPUID settings */ #define PCI_SETTINGS /* PCI device settings */
//#define MEMMAP_SETTINGS /* Memory map settings */ #define USB_SETTINGS /* USB device settings */
//#define VMWARE_SETTINGS /* VMware GuestInfo settings */
//#define VRAM_SETTINGS /* Video RAM dump settings */ /* Settings sources supported only on EFI platforms */
//#define ACPI_SETTINGS /* ACPI settings */ #if defined ( PLATFORM_efi )
#define EFI_SETTINGS /* EFI variable settings */
#endif
/* Settings sources supported only when memory maps are available */
#if ! defined ( MEMMAP_NULL )
//#define MEMMAP_SETTINGS /* Memory map settings */
#endif
/* Settings sources supported only on x86 CPUs */
#if defined ( __i386__ ) || defined ( __x86_64__ )
//#define CPUID_SETTINGS /* CPUID settings */
//#define VMWARE_SETTINGS /* VMware GuestInfo settings */
//#define VRAM_SETTINGS /* Video RAM dump settings */
#endif
#include <config/named.h> #include <config/named.h>
#include NAMED_CONFIG(settings.h) #include NAMED_CONFIG(settings.h)