From 60f4b6e98b11b9e16317b8cae93e3e7e58407876 Mon Sep 17 00:00:00 2001 From: Eric Norum Date: Fri, 16 May 2008 21:55:13 +0000 Subject: Use shared version of bootstrap to set up workspace. --- c/src/lib/libbsp/m68k/uC5282/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/uC5282/Makefile.am | 4 +++- c/src/lib/libbsp/m68k/uC5282/configure.ac | 3 ++- c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c | 28 ++++--------------------- c/src/lib/libbsp/m68k/uC5282/startup/linkcmds | 1 - 5 files changed, 14 insertions(+), 27 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 118645b8a2..b441e17e43 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,8 @@ +2008-05-16 Eric Norum + + * Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Use + shared version of bootstrap to set up workspace. + 2008-05-14 Joel Sherrill * Makefile.am: Rework to avoid .rel files. diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index 1611e21834..2b752a53f6 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -27,7 +27,9 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ - ../../m68k/shared/m68kpretaskinghook.c startup/init5282.c \ + ../../shared/bsppretaskinghook.c \ + ../../m68k/shared/m68kbspgetworkarea.c \ + startup/init5282.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../m68k/shared/setvec.c ../../shared/gnatinstallhandler.c clock_SOURCES = clock/clock.c diff --git a/c/src/lib/libbsp/m68k/uC5282/configure.ac b/c/src/lib/libbsp/m68k/uC5282/configure.ac index b445ec2693..cbed4102c2 100644 --- a/c/src/lib/libbsp/m68k/uC5282/configure.ac +++ b/c/src/lib/libbsp/m68k/uC5282/configure.ac @@ -16,9 +16,10 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING - AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION + # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c index ebbda06d6e..cc4ed30f67 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c @@ -227,34 +227,14 @@ static void handler(int pc) void bsp_start( void ) { int i; - extern char _WorkspaceBase[]; extern char _RamBase[], _RamSize[]; - extern unsigned long _M68k_Ramsize; - - _M68k_Ramsize = (unsigned long)_RamSize; /* RAM size set in linker script */ - - /* - * Allocate the memory for the RTEMS Work Space. This can come from - * a variety of places: hard coded address, malloc'ed from outside - * RTEMS world (e.g. simulator or primitive memory manager), or (as - * typically done by stock BSPs) by subtracting the required amount - * of work space from the last physical address on the CPU board. - */ - - /* - * Set up default exception handler - */ - for (i = 2 ; i < 256 ; i++) - if (i != (32+2)) /* Catch all but bootrom system calls */ - *((void (**)(int))(i * 4)) = handler; /* - * Need to "allocate" the memory for the RTEMS Workspace and - * tell the RTEMS configuration where it is. This memory is - * not malloc'ed. It is just "pulled from the air". + * Set up default exception handler */ - - Configuration.work_space_start = (void *)_WorkspaceBase; + for (i = 2 ; i < 256 ; i++) + if (i != (32+2)) /* Catch all but bootrom system calls */ + *((void (**)(int))(i * 4)) = handler; /* * Invalidate the cache and disable it diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds b/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds index 43cc352ccd..5b097df50f 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds @@ -166,7 +166,6 @@ SECTIONS . = ALIGN (16); PROVIDE (end = .); _clear_end = .; - _WorkspaceBase = .; } >ram /* Stabs debugging sections. */ -- cgit v1.2.3