From a4bd6b0d2225b7eedc38576dd638b65df89f58b0 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
Date: Sun, 3 Jan 2016 11:14:45 +0100
Subject: [PATCH] move HermitCore's start address to 8MB

---
 hermit/kernel/main.c  | 11 ++++++-----
 hermit/tools/init.asm |  2 +-
 hermit/usr/binutils   |  2 +-
 hermit/usr/newlib     |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/hermit/kernel/main.c b/hermit/kernel/main.c
index e563cdb9d..d17faf3ff 100644
--- a/hermit/kernel/main.c
+++ b/hermit/kernel/main.c
@@ -67,8 +67,7 @@ volatile int8_t shutdown = 0;
  */
 extern const void kernel_start;
 extern const void kernel_end;
-extern const void kbss_start;
-extern const void kbss_end;
+extern const void hbss_start;
 extern const void tls_start;
 extern const void tls_end;
 extern const void __bss_start;
@@ -110,8 +109,8 @@ static int hermit_init(void)
 	uint32_t i;
 	size_t sz = (size_t) &percore_end0 - (size_t) &percore_start;
 
-	// initialize .kbss section
-	memset((void*)&kbss_start, 0x00, ((size_t) &kbss_end - (size_t) &kbss_start));
+	// initialize .kbss sections
+	memset((void*)&hbss_start, 0x00, ((size_t) &kernel_end - (size_t) &hbss_start));
 
 	// initialize .percore section => copy first section to all other sections
 	for(i=1; i<MAX_CORES; i++)
@@ -223,6 +222,7 @@ int smp_main(void)
 }
 #endif
 
+#if 0
 static int init_rcce(void)
 {
 	size_t addr;
@@ -240,6 +240,7 @@ static int init_rcce(void)
 
 	return 0;
 }
+#endif
 
 int libc_start(int argc, char** argv);
 
@@ -416,7 +417,7 @@ int hermit_main(void)
 	kprintf("Isle %d of %d possible isles\n", isle, possible_isles);
 	kprintf("Kernel starts at %p and ends at %p\n", &kernel_start, &kernel_end);
 	kprintf("TLS image starts at %p and ends at %p\n", &tls_start, &tls_end);
-	kprintf("Kernel BBS starts at %p and ends at %p\n", &kbss_start, &kbss_end);
+	kprintf("Kernel BBS starts at %p and ends at %p\n", &hbss_start, &kernel_end);
 	kprintf("Per core data starts at %p and ends at %p\n", &percore_start, &percore_end);
 	kprintf("Per core size 0x%zd\n", (size_t) &percore_end0 - (size_t) &percore_start);
 	kprintf("Processor frequency: %u MHz\n", get_cpu_frequency());
diff --git a/hermit/tools/init.asm b/hermit/tools/init.asm
index 814d0dd22..0946d7896 100644
--- a/hermit/tools/init.asm
+++ b/hermit/tools/init.asm
@@ -14,7 +14,7 @@
 ; We switch to the protected mode and jump to HermitCore's kernel.
 
 KERNEL_STACK_SIZE equ 0x100
-kernel_start equ 0x200000
+kernel_start equ 0x800000
 
 [BITS 16]
 SECTION .text
diff --git a/hermit/usr/binutils b/hermit/usr/binutils
index 2a3a8f69d..a3867abf9 160000
--- a/hermit/usr/binutils
+++ b/hermit/usr/binutils
@@ -1 +1 @@
-Subproject commit 2a3a8f69d5aadde3fb41d4084cd95f01a3e7fa03
+Subproject commit a3867abf974ad30980fc557778b061a42af5a77f
diff --git a/hermit/usr/newlib b/hermit/usr/newlib
index e56071244..fb9537cd0 160000
--- a/hermit/usr/newlib
+++ b/hermit/usr/newlib
@@ -1 +1 @@
-Subproject commit e56071244e43980b3ef46f571a533b62ff5874ab
+Subproject commit fb9537cd0c71a196fd5efc1538c0ecc61334a114