parent
0ddda79511
commit
f825775e40
|
@ -13,7 +13,14 @@
|
||||||
DEFINES += -DCONFIG_DEBUG_BUILD
|
DEFINES += -DCONFIG_DEBUG_BUILD
|
||||||
--- src/kernel/sel4/src/plat/pc99/linker.lds
|
--- src/kernel/sel4/src/plat/pc99/linker.lds
|
||||||
+++ src/kernel/sel4/src/plat/pc99/linker.lds
|
+++ src/kernel/sel4/src/plat/pc99/linker.lds
|
||||||
@@ -22,7 +22,7 @@
|
@@ -16,13 +16,13 @@
|
||||||
|
#if defined(CONFIG_ARCH_IA32)
|
||||||
|
#undef i386
|
||||||
|
PADDR_BASE = 0x00000000;
|
||||||
|
-PADDR_LOAD = 0x00100000;
|
||||||
|
+PADDR_LOAD = 0x00200000;
|
||||||
|
KERNEL_BASE = 0xe0000000;
|
||||||
|
OUTPUT_ARCH(i386)
|
||||||
OUTPUT_FORMAT(elf32-i386)
|
OUTPUT_FORMAT(elf32-i386)
|
||||||
#elif defined(CONFIG_ARCH_X86_64)
|
#elif defined(CONFIG_ARCH_X86_64)
|
||||||
PADDR_BASE = 0x00000000;
|
PADDR_BASE = 0x00000000;
|
||||||
|
@ -22,3 +29,25 @@
|
||||||
KERNEL_BASE = 0xffffffff80000000;
|
KERNEL_BASE = 0xffffffff80000000;
|
||||||
OUTPUT_FORMAT(elf64-x86-64)
|
OUTPUT_FORMAT(elf64-x86-64)
|
||||||
#endif
|
#endif
|
||||||
|
--- src/kernel/sel4/include/plat/pc99/plat/64/plat_mode/machine/hardware.h
|
||||||
|
+++ src/kernel/sel4/include/plat/pc99/plat/64/plat_mode/machine/hardware.h
|
||||||
|
@@ -23,7 +23,7 @@
|
||||||
|
* because they need to defined like this in linker.lds
|
||||||
|
*/
|
||||||
|
#define PADDR_BASE 0x00000000ul
|
||||||
|
-#define PADDR_LOAD 0x00100000ul
|
||||||
|
+#define PADDR_LOAD 0x00200000ul
|
||||||
|
/* our kernel window is 2^39 bits (2^9 * 1gb) and the virtual address
|
||||||
|
* range is 48 bits. Therefore our base is 2^48 - 2^39
|
||||||
|
*/
|
||||||
|
--- src/kernel/sel4/include/plat/pc99/plat/32/plat_mode/machine/hardware.h
|
||||||
|
+++ src/kernel/sel4/include/plat/pc99/plat/32/plat_mode/machine/hardware.h
|
||||||
|
@@ -15,7 +15,7 @@
|
||||||
|
|
||||||
|
/* WARNING: some of these constants are also defined in linker.lds */
|
||||||
|
#define PADDR_BASE 0x00000000
|
||||||
|
-#define PADDR_LOAD 0x00100000
|
||||||
|
+#define PADDR_LOAD 0x00200000
|
||||||
|
#define PPTR_BASE 0xe0000000
|
||||||
|
|
||||||
|
#define PPTR_USER_TOP (PPTR_BASE & (~MASK(seL4_LargePageBits)))
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
7dc762b776af1721d742d70f6394f6177436817a
|
5de2f37b4752f45b087a874f0e3f34dac92f5b5d
|
||||||
|
|
|
@ -3,8 +3,8 @@ VERSION := git
|
||||||
DOWNLOADS := sel4.git
|
DOWNLOADS := sel4.git
|
||||||
|
|
||||||
URL(sel4) := https://github.com/seL4/seL4.git
|
URL(sel4) := https://github.com/seL4/seL4.git
|
||||||
# master branch, version 5.2
|
# master branch, version 6.0
|
||||||
REV(sel4) := 3695232f9603af60d56f97072082d90f30e98b0e
|
REV(sel4) := 8564ace4dfb622ec69e0f7d762ebfbc8552ec918
|
||||||
DIR(sel4) := src/kernel/sel4
|
DIR(sel4) := src/kernel/sel4
|
||||||
|
|
||||||
$(call check_tool,python)
|
$(call check_tool,python)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user