diff options
| author | Simon Rettberg | 2023-10-06 18:37:21 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2023-10-06 18:37:21 +0200 |
| commit | 95a57769874a70456670984debc05084feb75f6b (patch) | |
| tree | 9943c86b682e1b1d21a0439637b3849840a50137 /src/config | |
| parent | [efi] Remove old RDRAND hack; now officially supported (diff) | |
| parent | [libc] Use wall clock time as seed for the (non-cryptographic) RNG (diff) | |
| download | ipxe-95a57769874a70456670984debc05084feb75f6b.tar.gz ipxe-95a57769874a70456670984debc05084feb75f6b.tar.xz ipxe-95a57769874a70456670984debc05084feb75f6b.zip | |
Merge branch 'master' into openslx
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/config.c | 6 | ||||
| -rw-r--r-- | src/config/defaults/efi.h | 7 | ||||
| -rw-r--r-- | src/config/general.h | 1 | ||||
| -rw-r--r-- | src/config/settings.h | 2 |
4 files changed, 16 insertions, 0 deletions
diff --git a/src/config/config.c b/src/config/config.c index a81866132..abb7d16a2 100644 --- a/src/config/config.c +++ b/src/config/config.c @@ -290,6 +290,9 @@ REQUIRE_OBJECT ( cert_cmd ); #ifdef IMAGE_MEM_CMD REQUIRE_OBJECT ( image_mem_cmd ); #endif +#ifdef SHIM_CMD +REQUIRE_OBJECT ( shim_cmd ); +#endif /* * Drag in miscellaneous objects @@ -352,6 +355,9 @@ REQUIRE_OBJECT ( vram_settings ); #ifdef ACPI_SETTINGS REQUIRE_OBJECT ( acpi_settings ); #endif +#ifdef EFI_SETTINGS +REQUIRE_OBJECT ( efi_settings ); +#endif /* * Drag in selected keyboard map diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h index 8e53b9ab6..e39d475b7 100644 --- a/src/config/defaults/efi.h +++ b/src/config/defaults/efi.h @@ -48,6 +48,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define REBOOT_CMD /* Reboot command */ +#define EFI_SETTINGS /* EFI variable settings */ + #if defined ( __i386__ ) || defined ( __x86_64__ ) #define IOAPI_X86 #define NAP_EFIX86 @@ -65,4 +67,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define IMAGE_GZIP /* GZIP image support */ #endif +#if defined ( __loongarch__ ) +#define IOAPI_LOONG64 +#define NAP_EFILOONG64 +#endif + #endif /* CONFIG_DEFAULTS_EFI_H */ diff --git a/src/config/general.h b/src/config/general.h index 51ccaeaa4..fff4b3925 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -161,6 +161,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); //#define IMAGE_MEM_CMD /* Read memory command */ #define IMAGE_ARCHIVE_CMD /* Archive image management commands */ #define EFIMAP_CMD /* EFI Map command */ +#define SHIM_CMD /* EFI shim command (or dummy command) */ /* * ROM-specific options diff --git a/src/config/settings.h b/src/config/settings.h index d9c86a384..d7f787d38 100644 --- a/src/config/settings.h +++ b/src/config/settings.h @@ -9,6 +9,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); +#include <config/defaults.h> + #define PCI_SETTINGS /* PCI device settings */ //#define CPUID_SETTINGS /* CPUID settings */ //#define MEMMAP_SETTINGS /* Memory map settings */ |