diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-08-08 12:54:15 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-08-08 12:54:15 +0000 |
commit | c23386ae3602cf02b6fddac6972188132f398b5d (patch) | |
tree | 44eb8f197c434dd81e55aaf85ed9f532f519b86b /c/src/lib/libbsp/m68k | |
parent | 2002-08-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-c23386ae3602cf02b6fddac6972188132f398b5d.tar.bz2 |
2002-08-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* startup/Makefile.am: Remove -DGDB_MONITOR_ACTIVE (Not used
anywhere).
Add ODS60302_DEBUG conditional.
* include/bsp.h: Fix broken bsp_cat macros (Not compliant to gcc31).
* configure.ac: Add --enable-ods60302-debug.
Add ODS60302_DEBUG conditional.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/m68k/ods68302/ChangeLog | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/ods68302/configure.ac | 15 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/ods68302/include/bsp.h | 4 |
3 files changed, 26 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index d75ea17206..be823a025e 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,12 @@ +2002-08-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * startup/Makefile.am: Remove -DGDB_MONITOR_ACTIVE (Not used + anywhere). + Add ODS60302_DEBUG conditional. + * include/bsp.h: Fix broken bsp_cat macros (Not compliant to gcc31). + * configure.ac: Add --enable-ods60302-debug. + Add ODS60302_DEBUG conditional. + 2002-08-05 Joel Sherrill <joel@OARcorp.com> * Per PR260 eliminate use of make-target-options. This impacted diff --git a/c/src/lib/libbsp/m68k/ods68302/configure.ac b/c/src/lib/libbsp/m68k/ods68302/configure.ac index 2ca567a0a8..e9d43c7638 100644 --- a/c/src/lib/libbsp/m68k/ods68302/configure.ac +++ b/c/src/lib/libbsp/m68k/ods68302/configure.ac @@ -15,7 +15,22 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS +AC_ARG_ENABLE(ods68302-debug, +[AC_HELP_STRING([--enable-ods68302-debug], + [whether to support bsp debugging])], +[case $enable_ods68302_debug in + yes ) ODS68302_DEBUG=yes;; + * ) ODS68302_DEBUG=no;; + esac], +[ODS68302_DEBUG=no]) +AM_CONDITIONAL(ODS68302_DEBUG,[test "$ODS68302_DEBUG" = "yes"]) + +# FIXME: Something seem to be very broken inside of this BSP +# It plays tricks with VARIANT +# For now, deactivate it. +# BSP_VARIANT=${BSP_VARIANT-bare} +# AC_DEFINE_UNQUOTED([VARIANT],[${BSP_VARIANT}],[missing explanation]) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h index 8ece648cca..d6b784ffcf 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h @@ -44,11 +44,11 @@ extern "C" { #if defined(VARIANT) #define __bsp_cat(x, y) x ## y -#define __bsp_xcat(x, y) __bsp_cat(x, y) +#define __bsp_xcat(x, y) __bsp_cat(x,y) #define __bsp_str(s) #s #define __bsp_xstr(s) __bsp_str(s) -#define __BSP_HEADER_FILE__ __bsp_xcat(VARIANT, .h) +#define __BSP_HEADER_FILE__ __bsp_xcat(VARIANT,.h) #define __BSP_HEADER_FILE_STR__ __bsp_xstr(__BSP_HEADER_FILE__) #include __BSP_HEADER_FILE_STR__ |