From 9b0c08912010a38565c54870b976a9d8d0e7c8b0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Sep 2008 19:03:30 +0000 Subject: 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, startup/bspstart.c: Add use of bsp_get_work_area() in its own file and rely on BSP Framework to perform more initialization. Remove unnecessary includes of rtems/libio.h and rtems/libcsupport.h. --- c/src/lib/libbsp/m68k/mcf52235/ChangeLog | 7 +++++++ c/src/lib/libbsp/m68k/mcf52235/Makefile.am | 6 ++---- c/src/lib/libbsp/m68k/mcf52235/configure.ac | 2 ++ c/src/lib/libbsp/m68k/mcf52235/startup/bspstart.c | 3 --- c/src/lib/libbsp/m68k/mcf5329/ChangeLog | 7 +++++++ c/src/lib/libbsp/m68k/mcf5329/Makefile.am | 3 +-- c/src/lib/libbsp/m68k/mcf5329/configure.ac | 2 ++ c/src/lib/libbsp/m68k/mcf5329/startup/bspstart.c | 1 - 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog index 8b7e67868c..9e81791dcc 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog @@ -1,3 +1,10 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, configure.ac, startup/bspstart.c: Add use of + bsp_get_work_area() in its own file and rely on BSP Framework to + perform more initialization. Remove unnecessary includes of + rtems/libio.h and rtems/libcsupport.h. + 2008-09-10 Joel Sherrill * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am index 4bd8555479..8f6ad221fc 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am @@ -27,11 +27,9 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../m68k/shared/m68kpretaskinghook.c \ - ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \ startup/init52235.c startup/bspstart.c startup/cfinit.c\ - ../../shared/bootcard.c \ - ../../shared/sbrk.c ../../m68k/shared/setvec.c \ + ../../shared/bootcard.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c clock_SOURCES = clock/clock.c console_SOURCES = console/console.c diff --git a/c/src/lib/libbsp/m68k/mcf52235/configure.ac b/c/src/lib/libbsp/m68k/mcf52235/configure.ac index 3d888777c9..86b315578c 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf52235/configure.ac @@ -20,6 +20,8 @@ RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION #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/mcf52235/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf52235/startup/bspstart.c index 2ce509c7fc..6e2e7f5a19 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mcf52235/startup/bspstart.c @@ -15,15 +15,12 @@ * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * * http://www.rtems.com/license/LICENSE. * * $Id$ */ #include -#include -#include /* * Cannot be frozen diff --git a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog index 43fc75fe57..9fc5e04732 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog @@ -1,3 +1,10 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, configure.ac, startup/bspstart.c: Add use of + bsp_get_work_area() in its own file and rely on BSP Framework to + perform more initialization. Remove unnecessary includes of + rtems/libio.h and rtems/libcsupport.h. + 2008-09-10 Joel Sherrill * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am index 52d1bd4350..01c8e9b139 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -27,8 +27,7 @@ dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../m68k/shared/m68kpretaskinghook.c \ - ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \ startup/init5329.c startup/bspstart.c startup/cfinit.c\ ../../shared/bootcard.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/mcf5329/configure.ac b/c/src/lib/libbsp/m68k/mcf5329/configure.ac index 7d232d4fdb..9d689e9bc9 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5329/configure.ac @@ -20,6 +20,8 @@ RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION 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/mcf5329/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5329/startup/bspstart.c index bd3011132f..4c599d3374 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mcf5329/startup/bspstart.c @@ -1,4 +1,3 @@ - /* * BSP startup * -- cgit v1.2.3