diff options
Diffstat (limited to 'c/src/lib/libbsp/sh/shsim')
| -rw-r--r-- | c/src/lib/libbsp/sh/shsim/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/shsim/configure.ac | 11 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/shsim/console/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am | 7 |
4 files changed, 16 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index 7c9c6b20d7..f7cac7fadc 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,10 @@ +2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Apply RTEMS_BSPOPTS_*(CPU_CLOCK_RATE_HZ). + * console/Makefile.am: C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o). + * wrapup/Makefile.am: Add gdbsci, scitab to BSP_FILES, add + CPU_FILES. + 2001-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Introduce RTEMS_BSP_CONFIGURE. diff --git a/c/src/lib/libbsp/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac index d6b5ac1c5c..4ca18a42a6 100644 --- a/c/src/lib/libbsp/sh/shsim/configure.ac +++ b/c/src/lib/libbsp/sh/shsim/configure.ac @@ -16,6 +16,7 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS +## bsp-specific options RTEMS_BSP_ARG_ENABLE([console], [ --enable-console=[[null|gdbsci1]]],[ case $enable_console in @@ -57,13 +58,9 @@ AC_DEFINE_UNQUOTED( [whether support for functional IOMEM in shsim/gdb shall be enabled]) fi -## bsp-specific options -CPU_CLOCK_RATE_HZ=${CPU_CLOCK_RATE_HZ-20000000} -AC_SUBST(CPU_CLOCK_RATE_HZ) -AC_DEFINE_UNQUOTED( - [CPU_CLOCK_RATE_HZ], - [$CPU_CLOCK_RATE_HZ], - [cpu clock rate in HZ]) +RTEMS_BSPOPTS_SET([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/shsim/console/Makefile.am b/c/src/lib/libbsp/sh/shsim/console/Makefile.am index 563ae4cc64..deddacb7e7 100644 --- a/c/src/lib/libbsp/sh/shsim/console/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/console/Makefile.am @@ -9,7 +9,7 @@ VPATH = @srcdir@:@srcdir@/../../shared PGM = $(ARCH)/console.rel C_FILES = console.c -C_O_FILES = $(C_FILES:shared/%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am b/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am index 7a5744c97d..67d4beb592 100644 --- a/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am @@ -4,9 +4,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 -BSP_FILES = startup clock console timer +BSP_FILES = startup clock console timer gdbsci scitab -# CPU_PIECES = score +CPU_PIECES = score include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am @@ -14,7 +14,8 @@ include $(top_srcdir)/../../../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ + $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a |