From 45f67b179e6c2a6be59c0305066dd4a0bcafd002 Mon Sep 17 00:00:00 2001 From: Oliver O'Halloran Date: Thu, 1 Oct 2020 16:52:16 +1000 Subject: skiboot.lds.S: Move BSS start up a bit to accommodate a larger .data Witht addition of libtss and mbedtls the .data section now overlaps the start of the .bss section. Adding a few MB to the offset doesn't hurt. Signed-off-by: Oliver O'Halloran --- include/mem-map.h | 4 ++-- skiboot.lds.S | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/mem-map.h b/include/mem-map.h index 15ec09e..9250a63 100644 --- a/include/mem-map.h +++ b/include/mem-map.h @@ -84,8 +84,8 @@ * * As of mid-2019, a 2 socket Romulus uses ~4MB heap. */ -#define HEAP_BASE (SKIBOOT_BASE + 0x00500000) -#define HEAP_SIZE 0x00b00000 +#define HEAP_BASE (SKIBOOT_BASE + 0x00600000) +#define HEAP_SIZE 0x00a00000 /* This is the location of our console buffer at base + 16M */ #define INMEM_CON_START (SKIBOOT_BASE + 0x01000000) diff --git a/skiboot.lds.S b/skiboot.lds.S index b136e40..5da6f9d 100644 --- a/skiboot.lds.S +++ b/skiboot.lds.S @@ -219,8 +219,8 @@ SECTIONS } _edata = .; - /* We locate the BSS at 4M to leave room for the symbol map */ - . = 0x400000; + /* We locate the BSS at 5M to leave room for the symbol map */ + . = 0x500000; _sbss = .; .bss : { @@ -231,7 +231,7 @@ SECTIONS _ebss = .; _end = .; - ASSERT(HEAP_BASE >= _end, "Heap collision with image") + ASSERT((HEAP_BASE - SKIBOOT_BASE) >= _end, "Heap collision with image") DEBUG_SECTIONS -- cgit v1.1