From 89c3f8498f3b6382d303e5d07625a555af370cdf Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 29 Jun 2009 23:16:44 +0000 Subject: 2009-06-29 Xi Yang * Makefile.am: Update to current style. * bsp_specs: Fix warning for _start. * start/start.S: Proper attribution for origin. * startup/bspstart.c: Add Skyeye bsp_reset() on Skyeye. * include/.cvsignore: New file. * include/bspopts.h.in: Removed. --- c/src/lib/libbsp/arm/gumstix/ChangeLog | 9 ++++++ c/src/lib/libbsp/arm/gumstix/Makefile.am | 36 ++++++++--------------- c/src/lib/libbsp/arm/gumstix/bsp_specs | 4 +-- c/src/lib/libbsp/arm/gumstix/include/.cvsignore | 4 +++ c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in | 34 --------------------- c/src/lib/libbsp/arm/gumstix/start/start.S | 2 +- c/src/lib/libbsp/arm/gumstix/startup/bspstart.c | 8 +++++ 7 files changed, 37 insertions(+), 60 deletions(-) create mode 100644 c/src/lib/libbsp/arm/gumstix/include/.cvsignore delete mode 100644 c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/arm/gumstix/ChangeLog b/c/src/lib/libbsp/arm/gumstix/ChangeLog index c544035e2b..a5cdbf769c 100644 --- a/c/src/lib/libbsp/arm/gumstix/ChangeLog +++ b/c/src/lib/libbsp/arm/gumstix/ChangeLog @@ -1,3 +1,12 @@ +2009-06-29 Xi Yang + + * Makefile.am: Update to current style. + * bsp_specs: Fix warning for _start. + * start/start.S: Proper attribution for origin. + * startup/bspstart.c: Add Skyeye bsp_reset() on Skyeye. + * include/.cvsignore: New file. + * include/bspopts.h.in: Removed. + 2009-06-11 Joel Sherrill * startup/linkcmds: Fix spacing. diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am index 483b146ab9..7027010cc2 100755 --- a/c/src/lib/libbsp/arm/gumstix/Makefile.am +++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am @@ -28,31 +28,21 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ - ../../shared/bootcard.c ../../shared/sbrk.c \ - ../../shared/gnatinstallhandler.c ../../shared/bsppretaskinghook.c \ - ../../shared/bspclean.c ../../shared/bspreset.c \ - startup/bspstart.c startup/memmap.c - -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/uarts.c ../../shared/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += abort.rel -abort_rel_SOURCES = ../shared/abort/abort.c -abort_rel_CPPFLAGS = $(AM_CPPFLAGS) -abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - noinst_LIBRARIES = libbsp.a + libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel console.rel abort.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ +libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ + ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ + ../../shared/bootcard.c ../../shared/sbrk.c \ + ../../shared/gnatinstallhandler.c ../../shared/bsppretaskinghook.c \ + ../../shared/bspclean.c startup/bspstart.c startup/memmap.c + +#console +libbsp_a_SOURCES += console/uarts.c ../../shared/console.c +#abort +libbsp_a_SOURCES += ../shared/abort/abort.c + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/ffuart.rel \ diff --git a/c/src/lib/libbsp/arm/gumstix/bsp_specs b/c/src/lib/libbsp/arm/gumstix/bsp_specs index e08cc0f0f3..f079604d28 100755 --- a/c/src/lib/libbsp/arm/gumstix/bsp_specs +++ b/c/src/lib/libbsp/arm/gumstix/bsp_specs @@ -4,10 +4,10 @@ *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s}} +%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} *link: -%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -N -e _start} +%{!qrtems: %(old_link)} %{qrtems: -dp -Bstatic -N} *endfile: %{!qrtems: *(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s } diff --git a/c/src/lib/libbsp/arm/gumstix/include/.cvsignore b/c/src/lib/libbsp/arm/gumstix/include/.cvsignore new file mode 100644 index 0000000000..5f1077556d --- /dev/null +++ b/c/src/lib/libbsp/arm/gumstix/include/.cvsignore @@ -0,0 +1,4 @@ +bspopts.h +bspopts.h.in +stamp-h +stamp-h.in diff --git a/c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in b/c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in deleted file mode 100644 index 7c08e706cf..0000000000 --- a/c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in +++ /dev/null @@ -1,34 +0,0 @@ -/* include/bspopts.h.in. Generated from configure.ac by autoheader. */ - -/* If defined, then the BSP Framework will put a non-zero pattern into the - RTEMS Workspace and C program heap. This should assist in finding code that - assumes memory starts set to zero. */ -#undef BSP_DIRTY_MEMORY - -/* If defined, print a message and wait until pressed before resetting board - when application exits. */ -#undef BSP_PRESS_KEY_FOR_RESET - -/* If defined, reset the board when the application exits. */ -#undef BSP_RESET_BOARD_AT_EXIT - -/* If defined, enable options which optimize executingon the Skyeye simulator. - Speed up the clock ticks while the idle task is running so time spent in - the idle task is minimized. This significantly reduces the wall time - required to execute the RTEMS test suites. */ -#undef ON_SKYEYE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION diff --git a/c/src/lib/libbsp/arm/gumstix/start/start.S b/c/src/lib/libbsp/arm/gumstix/start/start.S index 844ded6763..882e213eb8 100755 --- a/c/src/lib/libbsp/arm/gumstix/start/start.S +++ b/c/src/lib/libbsp/arm/gumstix/start/start.S @@ -1,6 +1,6 @@ /* * By Yang Xi . - * Based upon CSB336 + * Based upon CSB337 * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at diff --git a/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c b/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c index 33e8efe87c..7e948b6e3a 100755 --- a/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c @@ -43,3 +43,11 @@ void bsp_start_default( void ) * can override the actual bsp_start routine used. */ void bsp_start (void) __attribute__ ((weak, alias("bsp_start_default"))); + + +void bsp_reset( void ) +{ +#if ON_SKYEYE == 1 + SKYEYE_MAGIC_ADDRESS = 0xff; +#endif +} -- cgit v1.2.3