From 70d7eaa9d9220a48243405a61df4d4133868cc00 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 15 Oct 2001 18:07:19 +0000 Subject: 2001-10-12 Ralf Corsepius * configure.ac: Added support for START_HW_INIT. * console/Makefile.am: Removed VPATH. * include/Makefile.am: Added missing ramdisk.h to include_HEADERS. * startup/linkcmds: Do not force output format to coff-sh. * startup/linkcmds-le: Comment out force of output format and add comment questioning need to have special linkcmds for little endian. * wrapup/Makefile.am: Add ramdisk to list of BSP_PIECES. --- c/src/lib/libbsp/sh/simsh4/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/sh/simsh4/configure.ac | 11 ++++++++++- c/src/lib/libbsp/sh/simsh4/console/Makefile.am | 2 -- c/src/lib/libbsp/sh/simsh4/include/Makefile.am | 2 +- c/src/lib/libbsp/sh/simsh4/startup/linkcmds | 2 ++ c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le | 5 ++++- c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am | 7 +++++-- 7 files changed, 32 insertions(+), 7 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog index c5181c13ed..7e12f1e4f1 100644 --- a/c/src/lib/libbsp/sh/simsh4/ChangeLog +++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog @@ -1,3 +1,13 @@ +2001-10-12 Ralf Corsepius + + * configure.ac: Added support for START_HW_INIT. + * console/Makefile.am: Removed VPATH. + * include/Makefile.am: Added missing ramdisk.h to include_HEADERS. + * startup/linkcmds: Do not force output format to coff-sh. + * startup/linkcmds-le: Comment out force of output format and add + comment questioning need to have special linkcmds for little endian. + * wrapup/Makefile.am: Add ramdisk to list of BSP_PIECES. + 2001-10-12 Ralf Corsepius * configure.ac: Add bspopts.h; Add CPU_CLOCK_RATE_HZ. diff --git a/c/src/lib/libbsp/sh/simsh4/configure.ac b/c/src/lib/libbsp/sh/simsh4/configure.ac index e29fc64b59..1d435d2d34 100644 --- a/c/src/lib/libbsp/sh/simsh4/configure.ac +++ b/c/src/lib/libbsp/sh/simsh4/configure.ac @@ -22,12 +22,21 @@ RTEMS_CANONICAL_HOST ## bsp-specific options CPU_CLOCK_RATE_HZ=${CPU_CLOCK_RATE_HZ-10000000} -AC_SUBST(CPU_CLOCK_RATE_HZ) AC_DEFINE_UNQUOTED( [CPU_CLOCK_RATE_HZ], [$CPU_CLOCK_RATE_HZ], [cpu clock rate in HZ]) +# START_HW_INIT +# This switch selects whether 'early_hw_init()' is called from +# 'start.S'; 'bsp_hw_init()' is always called from 'bspstart.c' +# +START_HW_INIT=${START_HW_INIT-1} +AC_DEFINE_UNQUOTED( + [START_HW_INIT], + [$START_HW_INIT], + [Whether to call early_hw_init from start.S]) + AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT diff --git a/c/src/lib/libbsp/sh/simsh4/console/Makefile.am b/c/src/lib/libbsp/sh/simsh4/console/Makefile.am index d759853180..81c2d41de8 100644 --- a/c/src/lib/libbsp/sh/simsh4/console/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/console/Makefile.am @@ -4,8 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = @srcdir@ - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/sh/simsh4/include/Makefile.am b/c/src/lib/libbsp/sh/simsh4/include/Makefile.am index e2a0c00be6..44b0a50df4 100644 --- a/c/src/lib/libbsp/sh/simsh4/include/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/include/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -include_HEADERS = bsp.h coverhd.h syscall.h ramdisk.h +include_HEADERS = bsp.h bspopts.h coverhd.h syscall.h ramdisk.h $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ diff --git a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds index 2aea30b1d2..ca81863085 100644 --- a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds +++ b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds @@ -19,7 +19,9 @@ * $Id$ */ +/* OUTPUT_FORMAT("coff-sh") + */ OUTPUT_ARCH(sh) ENTRY(_start) diff --git a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le index b2fd3094b2..71c4caaf7a 100644 --- a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le +++ b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le @@ -1,5 +1,8 @@ -OUTPUT_FORMAT("elf32-shl", "elf32-shl", +/* +FIXME: Why is a special linkcmds required for little endian? + OUTPUT_FORMAT("elf32-shl", "elf32-shl", "elf32-shl") + */ OUTPUT_ARCH(sh) ENTRY(_start) /* Do we need any of these for elf? diff --git a/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am index b30445beb9..a13a850e62 100644 --- a/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am @@ -6,14 +6,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 -BSP_PIECES = startup console clock ramdisk timer +BSP_PIECES = startup console clock timer + +# FIXME: This is missing. +# BSP_PIECES = ramdisk # pieces to pick up out of libcpu/sh CPU_PIECES = 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)/simsh4/$(piece)/$(ARCH)/$(piece).rel) + $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/sh7750/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3