genode/repos/base-sel4/patches/autoconf_64.patch

--- src/kernel/sel4/configs/pc99/autoconf.h
+++ src/kernel/sel4/configs/pc99/autoconf.h
@@ -129,7 +129,7 @@
 #define CONFIG_SEL4UTILS_STACK_SIZE 655360
 #define CONFIG_HAVE_LIB_SEL4_ALLOCMAN 1
 #define CONFIG_FASTPATH 1
-#define CONFIG_X2APIC 1
+#define CONFIG_XAPIC 1
 #define CONFIG_LIB_SEL4_VKA_DEBUG_LIVE_OBJS_SZ 0
 #define CONFIG_HAVE_TIMER 1
 #define CONFIG_SEL4UTILS_CSPACE_SIZE_BITS 18
@@ -147,7 +147,6 @@
 #define CONFIG_MAX_NUM_BOOTINFO_UNTYPED_CAPS 230
 #define CONFIG_LIB_SEL4_VKA_DEBUG_LIVE_SLOTS_SZ 0
 #define CONFIG_SYSCALL 1
-#define CONFIG_MAX_NUM_NODES 1
 #define CONFIG_CROSS_COMPILER_PREFIX ""
 #define CONFIG_MAX_RMRR_ENTRIES 32
 #define CONFIG_LIB_SEL4_INLINE_INVOCATIONS 1
@@ -162,21 +161,20 @@
 #define CONFIG_OPTIMISATION_O2 1
 #define CONFIG_HAVE_LIB_CPIO 1
 #define CONFIG_HAVE_LIB_SEL4_VKA 1
-#define CONFIG_FSGSBASE_INST 1
+#define CONFIG_FSGSBASE_MSR 1
 #define CONFIG_HAVE_LIB_SEL4_PLAT_SUPPORT 1
 #define CONFIG_USER_EXTRA_CFLAGS "-D_XOPEN_SOURCE=700"
 #define CONFIG_HAVE_FPU 1
 #define CONFIG_FPU_MAX_RESTORES_SINCE_SWITCH 64
 #define CONFIG_HAVE_LIB_SEL4_SIMPLE 1
 #define CONFIG_HAVE_LIB_ELF 1
-#define CONFIG_SUPPORT_PCID 1
 #define CONFIG_HAVE_LIB_PLATSUPPORT 1
-#define CONFIG_NUM_DOMAINS 16
+#define CONFIG_NUM_DOMAINS 1
 #define CONFIG_HAVE_LIB_UTILS 1
 #define CONFIG_USER_OPTIMISATION_O2 1
 #define CONFIG_LIB_CPIO 1
 #define CONFIG_RETYPE_FAN_OUT_LIMIT 256
-#define CONFIG_ROOT_CNODE_SIZE_BITS 16
+#define CONFIG_ROOT_CNODE_SIZE_BITS 18
 #define CONFIG_NUM_PRIORITIES 256
 #define CONFIG_TESTPRINTER_REGEX ".*"
 #define CONFIG_APP_SEL4TEST 1
@@ -189,9 +187,14 @@
 #define CONFIG_LIBSEL4DEBUG_ALLOC_BUFFER_ENTRIES 128
 #define CONFIG_CACHE_LN_SZ 64
 #define CONFIG_ARCH_X86_64 1
-#define CONFIG_HUGE_PAGE 1
 #define CONFIG_LIB_SEL4_MUSLC_SYS_MORECORE_BYTES 1048576
 #define CONFIG_BUILDSYS_USE_CCACHE 1
-#define CONFIG_MAX_NUM_NODES 1
+#define CONFIG_MAX_NUM_NODES 16
 #define CONFIG_KERNEL_STACK_BITS 12
+#define CONFIG_ARCH_X86_GENERIC 1
+#define CONFIG_MULTIBOOT1_HEADER
+#define CONFIG_MULTIBOOT2_HEADER
+#define CONFIG_PRINTING 1
+#define CONFIG_ENABLE_BENCHMARKS 1
+#define CONFIG_BENCHMARK_TRACK_UTILISATION 1
 #endif /* ARCH_IA32 */
sel4: use kernel branch 7.0 + our mastered commits for uefi, multiboot2, benchmark interface adaptations and ARM define build fixes. Issue #2562 2017-09-01 11:24:43 +00:00			`--- src/kernel/sel4/configs/pc99/autoconf.h`
			`+++ src/kernel/sel4/configs/pc99/autoconf.h`
			`@@ -129,7 +129,7 @@`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_SEL4UTILS_STACK_SIZE 655360`
			`#define CONFIG_HAVE_LIB_SEL4_ALLOCMAN 1`
			`#define CONFIG_FASTPATH 1`
			`-#define CONFIG_X2APIC 1`
sel4: add x86_64 support Issue #2451 2017-06-22 16:47:02 +00:00			`+#define CONFIG_XAPIC 1`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_LIB_SEL4_VKA_DEBUG_LIVE_OBJS_SZ 0`
sel4: add x86_64 support Issue #2451 2017-06-22 16:47:02 +00:00			`#define CONFIG_HAVE_TIMER 1`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_SEL4UTILS_CSPACE_SIZE_BITS 18`
sel4: use kernel branch 7.0 + our mastered commits for uefi, multiboot2, benchmark interface adaptations and ARM define build fixes. Issue #2562 2017-09-01 11:24:43 +00:00			`@@ -147,7 +147,6 @@`
sel4: enable smp for x86 Issue #2451 2017-08-07 15:55:15 +00:00			`#define CONFIG_MAX_NUM_BOOTINFO_UNTYPED_CAPS 230`
			`#define CONFIG_LIB_SEL4_VKA_DEBUG_LIVE_SLOTS_SZ 0`
			`#define CONFIG_SYSCALL 1`
			`-#define CONFIG_MAX_NUM_NODES 1`
			`#define CONFIG_CROSS_COMPILER_PREFIX ""`
			`#define CONFIG_MAX_RMRR_ENTRIES 32`
			`#define CONFIG_LIB_SEL4_INLINE_INVOCATIONS 1`
sel4: use kernel branch 7.0 + our mastered commits for uefi, multiboot2, benchmark interface adaptations and ARM define build fixes. Issue #2562 2017-09-01 11:24:43 +00:00			`@@ -162,21 +161,20 @@`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_OPTIMISATION_O2 1`
			`#define CONFIG_HAVE_LIB_CPIO 1`
			`#define CONFIG_HAVE_LIB_SEL4_VKA 1`
			`-#define CONFIG_FSGSBASE_INST 1`
sel4: add x86_64 support Issue #2451 2017-06-22 16:47:02 +00:00			`+#define CONFIG_FSGSBASE_MSR 1`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_HAVE_LIB_SEL4_PLAT_SUPPORT 1`
			`#define CONFIG_USER_EXTRA_CFLAGS "-D_XOPEN_SOURCE=700"`
			`#define CONFIG_HAVE_FPU 1`
sel4: add x86_64 support Issue #2451 2017-06-22 16:47:02 +00:00			`#define CONFIG_FPU_MAX_RESTORES_SINCE_SWITCH 64`
			`#define CONFIG_HAVE_LIB_SEL4_SIMPLE 1`
			`#define CONFIG_HAVE_LIB_ELF 1`
			`-#define CONFIG_SUPPORT_PCID 1`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_HAVE_LIB_PLATSUPPORT 1`
sel4: use kernel branch 7.0 + our mastered commits for uefi, multiboot2, benchmark interface adaptations and ARM define build fixes. Issue #2562 2017-09-01 11:24:43 +00:00			`-#define CONFIG_NUM_DOMAINS 16`
			`+#define CONFIG_NUM_DOMAINS 1`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_HAVE_LIB_UTILS 1`
sel4: adjust root cnode size for wand_quad board and cleanup for x86 32/64 the autoconf.h patches Fixes #2514 2017-09-06 12:00:43 +00:00			`#define CONFIG_USER_OPTIMISATION_O2 1`
			`#define CONFIG_LIB_CPIO 1`
			`#define CONFIG_RETYPE_FAN_OUT_LIMIT 256`
			`-#define CONFIG_ROOT_CNODE_SIZE_BITS 16`
			`+#define CONFIG_ROOT_CNODE_SIZE_BITS 18`
			`#define CONFIG_NUM_PRIORITIES 256`
			`#define CONFIG_TESTPRINTER_REGEX ".*"`
			`#define CONFIG_APP_SEL4TEST 1`
sel4: use kernel branch 7.0 + our mastered commits for uefi, multiboot2, benchmark interface adaptations and ARM define build fixes. Issue #2562 2017-09-01 11:24:43 +00:00			`@@ -189,9 +187,14 @@`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_LIBSEL4DEBUG_ALLOC_BUFFER_ENTRIES 128`
			`#define CONFIG_CACHE_LN_SZ 64`
sel4: add x86_64 support Issue #2451 2017-06-22 16:47:02 +00:00			`#define CONFIG_ARCH_X86_64 1`
			`-#define CONFIG_HUGE_PAGE 1`
sel4: update to 5.2.0 Issue #2451 2017-06-12 10:41:38 +00:00			`#define CONFIG_LIB_SEL4_MUSLC_SYS_MORECORE_BYTES 1048576`
			`#define CONFIG_BUILDSYS_USE_CCACHE 1`
sel4: enable smp for x86 Issue #2451 2017-08-07 15:55:15 +00:00			`-#define CONFIG_MAX_NUM_NODES 1`
sel4: use kernel branch 7.0 + our mastered commits for uefi, multiboot2, benchmark interface adaptations and ARM define build fixes. Issue #2562 2017-09-01 11:24:43 +00:00			`+#define CONFIG_MAX_NUM_NODES 16`
sel4: enable smp for x86 Issue #2451 2017-08-07 15:55:15 +00:00			`#define CONFIG_KERNEL_STACK_BITS 12`
sel4: use kernel branch 7.0 + our mastered commits for uefi, multiboot2, benchmark interface adaptations and ARM define build fixes. Issue #2562 2017-09-01 11:24:43 +00:00			`+#define CONFIG_ARCH_X86_GENERIC 1`
			`+#define CONFIG_MULTIBOOT1_HEADER`
			`+#define CONFIG_MULTIBOOT2_HEADER`
			`+#define CONFIG_PRINTING 1`
sel4: support cpu utilization via TRACE service using benchmark infrastructure of the seL4 kernel Issue #2451 2017-08-09 14:28:44 +00:00			`+#define CONFIG_ENABLE_BENCHMARKS 1`
			`+#define CONFIG_BENCHMARK_TRACK_UTILISATION 1`
sel4: use kernel branch 7.0 + our mastered commits for uefi, multiboot2, benchmark interface adaptations and ARM define build fixes. Issue #2562 2017-09-01 11:24:43 +00:00			`#endif /* ARCH_IA32 */`