From d43a5a6ef1889e43ed23402d4c3067f11e4f6171 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 6 Sep 2017 14:00:43 +0200 Subject: [PATCH] sel4: adjust root cnode size for wand_quad board and cleanup for x86 32/64 the autoconf.h patches Fixes #2514 --- repos/base-sel4/patches/autoconf_32.config | 14 ++++++++++---- repos/base-sel4/patches/autoconf_64.config | 14 +++++++++++--- repos/base-sel4/patches/root_cnode.patch | 11 ----------- repos/base-sel4/patches/wand_quad.config | 2 +- repos/base-sel4/ports/sel4.hash | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 repos/base-sel4/patches/root_cnode.patch diff --git a/repos/base-sel4/patches/autoconf_32.config b/repos/base-sel4/patches/autoconf_32.config index 479f11bf4..2a3942a42 100644 --- a/repos/base-sel4/patches/autoconf_32.config +++ b/repos/base-sel4/patches/autoconf_32.config @@ -10,7 +10,7 @@ #define CONFIG_ARCH_X86 1 #define CONFIG_APP_TESTS 1 #define CONFIG_MAX_NUM_IOAPIC 1 -@@ -32,15 +32,14 @@ +@@ -32,15 +33,14 @@ #define CONFIG_SEL4UTILS_STACK_SIZE 655360 #define CONFIG_HAVE_LIB_SEL4_ALLOCMAN 1 #define CONFIG_FASTPATH 1 @@ -37,7 +37,7 @@ #define CONFIG_CROSS_COMPILER_PREFIX "" #define CONFIG_MAX_RMRR_ENTRIES 32 #define CONFIG_LIB_SEL4_INLINE_INVOCATIONS 1 -@@ -66,7 +64,9 @@ +@@ -66,7 +65,9 @@ #define CONFIG_OPTIMISATION_O2 1 #define CONFIG_HAVE_LIB_CPIO 1 #define CONFIG_HAVE_LIB_SEL4_VKA 1 @@ -48,7 +48,7 @@ #define CONFIG_HAVE_LIB_SEL4_PLAT_SUPPORT 1 #define CONFIG_USER_EXTRA_CFLAGS "-D_XOPEN_SOURCE=700" #define CONFIG_HAVE_FPU 1 -@@ -76,6 +76,7 @@ +@@ -76,11 +77,12 @@ #define CONFIG_SUPPORT_PCID 1 #define CONFIG_HAVE_LIB_PLATSUPPORT 1 #define CONFIG_NUM_DOMAINS 1 @@ -56,7 +56,13 @@ #define CONFIG_HAVE_LIB_UTILS 1 #define CONFIG_USER_OPTIMISATION_O2 1 #define CONFIG_LIB_CPIO 1 -@@ -92,9 +92,8 @@ + #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 +@@ -92,9 +94,8 @@ #define CONFIG_KERNEL_EXTRA_CPPFLAGS "" #define CONFIG_LIBSEL4DEBUG_ALLOC_BUFFER_ENTRIES 128 #define CONFIG_CACHE_LN_SZ 64 diff --git a/repos/base-sel4/patches/autoconf_64.config b/repos/base-sel4/patches/autoconf_64.config index 75133c48a..bdeb0b4f7 100644 --- a/repos/base-sel4/patches/autoconf_64.config +++ b/repos/base-sel4/patches/autoconf_64.config @@ -25,7 +25,7 @@ #define CONFIG_LIB_PLATSUPPORT 1 #define CONFIG_LIB_SEL4_ALLOCMAN 1 #define CONFIG_HAVE_LIB_SEL4_SIMPLE_DEFAULT 1 -@@ -50,7 +50,7 @@ +@@ -50,7 +52,7 @@ #define CONFIG_MAX_NUM_BOOTINFO_UNTYPED_CAPS 230 #define CONFIG_LIB_SEL4_VKA_DEBUG_LIVE_SLOTS_SZ 0 #define CONFIG_SYSCALL 1 @@ -34,7 +34,7 @@ #define CONFIG_CROSS_COMPILER_PREFIX "" #define CONFIG_MAX_RMRR_ENTRIES 32 #define CONFIG_LIB_SEL4_INLINE_INVOCATIONS 1 -@@ -66,14 +68,13 @@ +@@ -66,21 +68,20 @@ #define CONFIG_OPTIMISATION_O2 1 #define CONFIG_HAVE_LIB_CPIO 1 #define CONFIG_HAVE_LIB_SEL4_VKA 1 @@ -50,7 +50,15 @@ #define CONFIG_HAVE_LIB_PLATSUPPORT 1 #define CONFIG_NUM_DOMAINS 1 #define CONFIG_HAVE_LIB_UTILS 1 -@@ -93,8 +93,8 @@ + #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 +@@ -93,8 +94,8 @@ #define CONFIG_LIBSEL4DEBUG_ALLOC_BUFFER_ENTRIES 128 #define CONFIG_CACHE_LN_SZ 64 #define CONFIG_ARCH_X86_64 1 diff --git a/repos/base-sel4/patches/root_cnode.patch b/repos/base-sel4/patches/root_cnode.patch deleted file mode 100644 index 9135d3adc..000000000 --- a/repos/base-sel4/patches/root_cnode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/kernel/sel4/configs/pc99/autoconf.h -+++ src/kernel/sel4/configs/pc99/autoconf.h -@@ -77,7 +77,7 @@ - #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 diff --git a/repos/base-sel4/patches/wand_quad.config b/repos/base-sel4/patches/wand_quad.config index caf6b8706..f8072a111 100644 --- a/repos/base-sel4/patches/wand_quad.config +++ b/repos/base-sel4/patches/wand_quad.config @@ -21,7 +21,7 @@ #define CONFIG_LIB_CPIO 1 #define CONFIG_RETYPE_FAN_OUT_LIMIT 256 -#define CONFIG_ROOT_CNODE_SIZE_BITS 12 -+#define CONFIG_ROOT_CNODE_SIZE_BITS 14 ++#define CONFIG_ROOT_CNODE_SIZE_BITS 15 #define CONFIG_NUM_PRIORITIES 256 #define CONFIG_TESTPRINTER_REGEX ".*" #define CONFIG_APP_SEL4TEST 1 diff --git a/repos/base-sel4/ports/sel4.hash b/repos/base-sel4/ports/sel4.hash index 0789ddf4d..8fae25764 100644 --- a/repos/base-sel4/ports/sel4.hash +++ b/repos/base-sel4/ports/sel4.hash @@ -1 +1 @@ -bcec842b37dfec2a17c0fb8b0564bced474bea0c +b00bc949a62cc71b45191b19c966f3a542b25c20