Merge branch 'master' into openslxopenslx

4 files changed, 60 insertions, 71 deletions

diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h
index b62ddb46a..baacae4f9 100644
--- a/src/config/defaults/efi.h
+++ b/src/config/defaults/efi.h
@@ -8,14 +8,15 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
-#define UACCESS_EFI
+#define UACCESS_FLAT
 #define IOMAP_VIRT
 #define PCIAPI_EFI
 #define DMAAPI_OP
-#define CONSOLE_EFI
 #define TIMER_EFI
 #define UMALLOC_EFI
+#define MEMMAP_NULL
 #define SMBIOS_EFI
 #define SANBOOT_EFI
 #define BOFM_EFI
@@ -24,53 +25,30 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define TIME_EFI
 #define REBOOT_EFI
 #define ACPI_EFI
-#define FDT_EFI
 #define MPAPI_EFI
-
-#define	NET_PROTO_IPV6		/* IPv6 protocol */
-#define	NET_PROTO_LLDP		/* Link Layer Discovery protocol */
-
-#define DOWNLOAD_PROTO_FILE	/* Local filesystem access */
-
-#define	IMAGE_EFI		/* EFI image support */
-#define	IMAGE_SCRIPT		/* iPXE script image support */
-
-#define	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
-#define	SANBOOT_PROTO_AOE	/* AoE protocol */
-#define	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
-#define	SANBOOT_PROTO_FCP	/* Fibre Channel protocol */
-#define	SANBOOT_PROTO_HTTP	/* HTTP SAN protocol */
-
-#define	USB_HCD_XHCI		/* xHCI USB host controller */
-#define	USB_HCD_EHCI		/* EHCI USB host controller */
-#define	USB_HCD_UHCI		/* UHCI USB host controller */
-#define	USB_EFI			/* Provide EFI_USB_IO_PROTOCOL interface */
-#define USB_BLOCK		/* USB block devices */
-
-#define	REBOOT_CMD		/* Reboot command */
-
-#define EFI_SETTINGS		/* EFI variable settings */
+#define NAP_EFI
+#define SERIAL_SPCR
 
 #if defined ( __i386__ ) || defined ( __x86_64__ )
 #define IOAPI_X86
-#define NAP_EFIX86
 #define ENTROPY_RDRAND
-#define	CPUID_CMD		/* x86 CPU feature detection command */
 #define	UNSAFE_STD		/* Avoid setting direction flag */
+#define FDT_NULL
 #endif
 
 #if defined ( __arm__ ) || defined ( __aarch64__ )
 #define IOAPI_ARM
-#define NAP_EFIARM
-#endif
-
-#if defined ( __aarch64__ )
-#define	IMAGE_GZIP		/* GZIP image support */
+#define FDT_EFI
 #endif
 
 #if defined ( __loongarch__ )
 #define IOAPI_LOONG64
-#define NAP_EFILOONG64
+#define FDT_EFI
+#endif
+
+#if defined ( __riscv )
+#define IOAPI_RISCV
+#define FDT_EFI
 #endif
 
 #endif /* CONFIG_DEFAULTS_EFI_H */
diff --git a/src/config/defaults/linux.h b/src/config/defaults/linux.h
index fae144b3d..9d8b217d3 100644
--- a/src/config/defaults/linux.h
+++ b/src/config/defaults/linux.h
@@ -9,10 +9,10 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#define CONSOLE_LINUX
 #define TIMER_LINUX
 #define UACCESS_LINUX
 #define UMALLOC_LINUX
+#define MEMMAP_NULL
 #define NAP_LINUX
 #define SMBIOS_LINUX
 #define SANBOOT_DUMMY
@@ -23,17 +23,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define DMAAPI_FLAT
 #define ACPI_LINUX
 #define MPAPI_NULL
+#define SERIAL_NULL
+#define FDT_NULL
 
 #define DRIVERS_LINUX
 
-#define IMAGE_SCRIPT
-
-#define SANBOOT_PROTO_ISCSI
-#define SANBOOT_PROTO_AOE
-#define SANBOOT_PROTO_IB_SRP
-#define SANBOOT_PROTO_FCP
-#define SANBOOT_PROTO_HTTP
-
 #if defined ( __i386__ ) || defined ( __x86_64__ )
 #define ENTROPY_RDRAND
 #endif
diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index fa12a1005..c4d3f7527 100644
--- a/src/config/defaults/pcbios.h
+++ b/src/config/defaults/pcbios.h
@@ -9,14 +9,14 @@
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
-#define UACCESS_LIBRM
+#define UACCESS_OFFSET
 #define IOAPI_X86
 #define PCIAPI_PCBIOS
 #define DMAAPI_FLAT
 #define TIMER_PCBIOS
-#define CONSOLE_PCBIOS
 #define NAP_PCBIOS
-#define UMALLOC_MEMTOP
+#define UMALLOC_UHEAP
+#define MEMMAP_INT15
 #define SMBIOS_PCBIOS
 #define SANBOOT_PCBIOS
 #define ENTROPY_RTC
@@ -25,6 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define REBOOT_PCBIOS
 #define ACPI_RSDP
 #define MPAPI_PCBIOS
+#define SERIAL_SPCR
+#define FDT_NULL
 
 #ifdef __x86_64__
 #define IOMAP_PAGES
@@ -32,28 +34,4 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define IOMAP_VIRT
 #endif
 
-#define	IMAGE_ELF		/* ELF image support */
-#define	IMAGE_MULTIBOOT		/* MultiBoot image support */
-#define	IMAGE_PXE		/* PXE image support */
-#define IMAGE_SCRIPT		/* iPXE script image support */
-#define IMAGE_BZIMAGE		/* Linux bzImage image support */
-
-#define PXE_STACK		/* PXE stack in iPXE - required for PXELINUX */
-#define PXE_MENU		/* PXE menu booting */
-
-#define	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
-#define	SANBOOT_PROTO_AOE	/* AoE protocol */
-#define	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
-#define	SANBOOT_PROTO_FCP	/* Fibre Channel protocol */
-#define SANBOOT_PROTO_HTTP	/* HTTP SAN protocol */
-
-#define	USB_HCD_XHCI		/* xHCI USB host controller */
-#define	USB_HCD_EHCI		/* EHCI USB host controller */
-#define	USB_HCD_UHCI		/* UHCI USB host controller */
-#define	USB_KEYBOARD		/* USB keyboards */
-#define USB_BLOCK		/* USB block devices */
-
-#define	REBOOT_CMD		/* Reboot command */
-#define	CPUID_CMD		/* x86 CPU feature detection command */
-
 #endif /* CONFIG_DEFAULTS_PCBIOS_H */
diff --git a/src/config/defaults/sbi.h b/src/config/defaults/sbi.h
new file mode 100644
index 000000000..f9361c926
--- /dev/null
+++ b/src/config/defaults/sbi.h
@@ -0,0 +1,39 @@
+#ifndef CONFIG_DEFAULTS_SBI_H
+#define CONFIG_DEFAULTS_SBI_H
+
+/** @file
+ *
+ * Configuration defaults for RISC-V SBI
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#define IOAPI_RISCV
+#define UACCESS_OFFSET
+#define TIMER_ZICNTR
+#define ENTROPY_ZKR
+
+#if __riscv_xlen == 64
+#define IOMAP_SVPAGE
+#define DMAAPI_RISCV
+#else
+#define IOMAP_VIRT
+#define DMAAPI_FLAT
+#endif
+
+#define FDT_SBI
+#define REBOOT_SBI
+#define UMALLOC_UHEAP
+#define MEMMAP_FDT
+#define SERIAL_FDT
+
+#define ACPI_NULL
+#define MPAPI_NULL
+#define NAP_NULL
+#define PCIAPI_NULL
+#define SANBOOT_NULL
+#define SMBIOS_NULL
+#define TIME_NULL
+
+#endif /* CONFIG_DEFAULTS_SBI_H */