From 6388a3f2d4ad5483ce652ec41e7759fa8b5a2c27 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 15 Nov 2001 16:53:56 +0000 Subject: 2001-11-15 Ralf Corsepius * configure.ac: Apply RTEMS_BSPOPTS_*(CPU_CLOCK_RATE_HZ). * wrapup/Makefile.am: Apply RTEMS_CPU_MODEL to pickup CPU_PIECES. --- c/src/lib/libbsp/sh/gensh1/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh1/configure.ac | 6 ++---- c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index 95ab4a400e..cf05dc0d92 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,8 @@ +2001-11-15 Ralf Corsepius + + * configure.ac: Apply RTEMS_BSPOPTS_*(CPU_CLOCK_RATE_HZ). + * wrapup/Makefile.am: Apply RTEMS_CPU_MODEL to pickup CPU_PIECES. + 2001-10-13 Ralf Corsepius * startup/Makefile.am: Remove AC_CFLAGS, HZ. diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac index 515a1fb0fb..7170a7cd8e 100644 --- a/c/src/lib/libbsp/sh/gensh1/configure.ac +++ b/c/src/lib/libbsp/sh/gensh1/configure.ac @@ -21,10 +21,8 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CANONICAL_HOST ## bsp-specific options -CPU_CLOCK_RATE_HZ=${CPU_CLOCK_RATE_HZ-20000000} -AC_DEFINE_UNQUOTED([CPU_CLOCK_RATE_HZ], - [$CPU_CLOCK_RATE_HZ], - [cpu clock rate in HZ]) +RTEMS_BSPOPTS_BSP([CPU_CLOCK_RATE_HZ],[*],[20000000]) +RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ]) ## Used in scitab/Makefile.am AC_SUBST(CPU_CLOCK_RATE_HZ) diff --git a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am index c9f3a140d3..109cc25fa3 100644 --- a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am @@ -13,7 +13,7 @@ CPU_PIECES = clock timer sci delay score # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/sh7032/$(piece)/$(ARCH)/$(piece).rel) + $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3