summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-15 16:54:16 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-15 16:54:16 +0000
commitd516bbfcd3b0b5327b47aa21b7651c3e51fc53d8 (patch)
tree6e3f87820e7ccdc876ccc262e0d097ec54e8fd2d
parent6388a3f2d4ad5483ce652ec41e7759fa8b5a2c27 (diff)
downloadrtems-d516bbfcd3b0b5327b47aa21b7651c3e51fc53d8.tar.bz2
2001-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add RTEMS_BSPOPTS_*(CPU_CLOCK_RATE_HZ), RTEMS_BSPOPTS_*(START_HW_INIT), RTEMS_BSPOPTS_*(STANDALONE_EVB). * wrapup/Makefile.am: Apply RTEMS_CPU_MODEL to pickup CPU_PIECES.
-rw-r--r--c/src/lib/libbsp/sh/gensh2/ChangeLog7
-rw-r--r--c/src/lib/libbsp/sh/gensh2/configure.ac15
-rw-r--r--c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am2
3 files changed, 19 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog
index 4a98efc70b..2d0e3233be 100644
--- a/c/src/lib/libbsp/sh/gensh2/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Add RTEMS_BSPOPTS_*(CPU_CLOCK_RATE_HZ),
+ RTEMS_BSPOPTS_*(START_HW_INIT),
+ RTEMS_BSPOPTS_*(STANDALONE_EVB).
+ * wrapup/Makefile.am: Apply RTEMS_CPU_MODEL to pickup CPU_PIECES.
+
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* startup/Makefile.am: Remove AC_CFLAGS, HZ.
diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac
index ad84f6c624..22eb0452f9 100644
--- a/c/src/lib/libbsp/sh/gensh2/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh2/configure.ac
@@ -21,14 +21,21 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CANONICAL_HOST
## bsp-specific options
-CPU_CLOCK_RATE_HZ=${CPU_CLOCK_RATE_HZ-29491200}
-AC_DEFINE_UNQUOTED([CPU_CLOCK_RATE_HZ],
- [$CPU_CLOCK_RATE_HZ],
- [cpu clock rate in HZ])
+RTEMS_BSPOPTS_SET([CPU_CLOCK_RATE_HZ],[*],[29491200])
+RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ])
## Used in scitab/Makefile.am
AC_SUBST(CPU_CLOCK_RATE_HZ)
+RTEMS_BSPOPTS_SET([START_HW_INIT],[*],[])
+RTEMS_BSPOPTS_HELP([START_HW_INIT],
+[If defined, selects whether 'early_hw_init()' is called from 'start.S';
+ 'bsp_hw_init()' is always called from 'bspstart.c'])
+
+RTEMS_BSPOPTS_SET([STANDALONE_EVB],[*],[])
+RTEMS_BSPOPTS_HELP([STANDALONE_EVB],
+[If defined, compiles code to jump-start from FLASH, without a monitor])
+
AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
diff --git a/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am
index 80f0d3ac29..3de3f27e06 100644
--- a/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am
@@ -13,7 +13,7 @@ CPU_PIECES = clock timer sci score
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
- $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/sh7045/$(piece)/$(ARCH)/$(piece).rel)
+ $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a