From d785ce4a56850371ce86011f2c26b4899f75a47c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 26 Mar 2009 11:18:03 +0000 Subject: 2009-03-26 Joel Sherrill * Makefile.am, console/console.c, startup/linkcmds: Now links but clearly the starting stack overlaps regular memory and needs to be moved. --- c/src/lib/libbsp/nios2/nios2_iss/ChangeLog | 6 ++++++ c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 2 +- c/src/lib/libbsp/nios2/nios2_iss/console/console.c | 4 ++++ c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog index 0aff4e144a..2ecb5c4c20 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog +++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog @@ -1,3 +1,9 @@ +2009-03-26 Joel Sherrill + + * Makefile.am, console/console.c, startup/linkcmds: Now links but + clearly the starting stack overlaps regular memory and needs to be + moved. + 2009-03-02 Joel Sherrill * Makefile.am, console/console.c: Use shared polled console framework. diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 4a70984dc8..762fb2847a 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -35,7 +35,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bspreset_loop.c ../../shared/bsppost.c startup/bspstart.c \ ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \ - ../../shared/gnatinstallhandler.c + ../../shared/gnatinstallhandler.c ../../shared/bsppredriverhook.c # clock libbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h # console diff --git a/c/src/lib/libbsp/nios2/nios2_iss/console/console.c b/c/src/lib/libbsp/nios2/nios2_iss/console/console.c index 90bff9a46b..d00a6a960f 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/console/console.c +++ b/c/src/lib/libbsp/nios2/nios2_iss/console/console.c @@ -52,6 +52,10 @@ bool is_character_ready( return false; } +void console_initialize_hardware(void) +{ +} + /* * This routine reads a character from the SOURCE. * diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds b/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds index f435acfe8c..34dee31e11 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds +++ b/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds @@ -242,6 +242,7 @@ SECTIONS . = ALIGN(32 / 8); __bss_end = ABSOLUTE(.); + WorkAreaBase = .; } > onchip_memory_0 /* -- cgit v1.2.3