diff options
| -rw-r--r-- | linker/linker_script.ld | 6 | ||||
| -rw-r--r-- | src/kern/init.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/linker/linker_script.ld b/linker/linker_script.ld index bec8fb7..ea6fc8a 100644 --- a/linker/linker_script.ld +++ b/linker/linker_script.ld @@ -26,13 +26,11 @@ SECTIONS . = ALIGN(0x04); DATA_SEGMENT_START = .; *(.data); + . = ALIGN(0x1c); DATA_SEGMENT_STOP = .; - /* INIT_ROUTINES_FLASH_START = + INIT_ROUTINES_FLASH_START = LOADADDR(.data) + (DATA_SEGMENT_STOP - DATA_SEGMENT_START); - */ - . = ALIGN(0x1c); - INIT_ROUTINES_FLASH_START = .; INITS_START = .; *(.init0); INIT_0_END = ABSOLUTE(INIT_ROUTINES_FLASH_START) + (. - INITS_START); diff --git a/src/kern/init.c b/src/kern/init.c index 2af3877..550fea0 100644 --- a/src/kern/init.c +++ b/src/kern/init.c @@ -44,6 +44,8 @@ extern uint32_t WAT; /* Test that data segment is properly set. */ static uint32_t magic_cookie = MAGIC_COOKIE; +void panic(const char*); + init2() { volatile uint32_t bss_start_ptr = (uint32_t)&BSS_START; @@ -96,6 +98,7 @@ init2() panic("Data Segment Initialization Failed!"); } + klogf("Magic Cookie Matches!\n"); klogf("Done!\n"); } |