From 270e3cce9610120bfc3b818bde99ffaf8f880940 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 11 Jul 2000 14:56:04 +0000 Subject: Patch rtems-rc-20000711-1-cvs.diff from Ralf Corsepius that decouples exec/ for the sh, m68k and i960 from targopts.h. NOTE: The change to system.h is a hack to enable cpuopts.h for some targets, but keep using targopts.h for others - I know it does *not* work for sparc, mips, i386 and ppc. This will have to be addressed as work continues on multilibing. --- c/src/exec/score/cpu/i960/asm.h | 2 +- c/src/exec/score/cpu/m68k/asm.h | 2 +- c/src/exec/score/cpu/no_cpu/asm.h | 2 +- c/src/exec/score/cpu/sh/asm.h | 2 +- c/src/exec/score/include/rtems/system.h | 11 +++++++++-- c/src/lib/libbsp/m68k/dmv152/console/Makefile.am | 2 ++ c/src/lib/libbsp/m68k/mvme167/console/Makefile.am | 1 + cpukit/score/cpu/i960/asm.h | 2 +- cpukit/score/cpu/m68k/asm.h | 2 +- cpukit/score/cpu/m68k/rtems/asm.h | 2 +- cpukit/score/cpu/no_cpu/asm.h | 2 +- cpukit/score/cpu/no_cpu/rtems/asm.h | 2 +- cpukit/score/cpu/sh/asm.h | 2 +- cpukit/score/cpu/sh/rtems/asm.h | 2 +- cpukit/score/include/rtems/system.h | 11 +++++++++-- make/custom/dmv152.cfg | 8 ++++++-- make/custom/mvme167.cfg | 9 +++++++-- 17 files changed, 45 insertions(+), 19 deletions(-) diff --git a/c/src/exec/score/cpu/i960/asm.h b/c/src/exec/score/cpu/i960/asm.h index a9a0788925..e98f900f59 100644 --- a/c/src/exec/score/cpu/i960/asm.h +++ b/c/src/exec/score/cpu/i960/asm.h @@ -33,7 +33,7 @@ #ifndef ASM #define ASM #endif -#include +#include #include /* diff --git a/c/src/exec/score/cpu/m68k/asm.h b/c/src/exec/score/cpu/m68k/asm.h index 456b213cb2..6c388fb396 100644 --- a/c/src/exec/score/cpu/m68k/asm.h +++ b/c/src/exec/score/cpu/m68k/asm.h @@ -33,7 +33,7 @@ #ifndef ASM #define ASM #endif -#include +#include #include /* diff --git a/c/src/exec/score/cpu/no_cpu/asm.h b/c/src/exec/score/cpu/no_cpu/asm.h index 1ca7fd435b..3e9164a28c 100644 --- a/c/src/exec/score/cpu/no_cpu/asm.h +++ b/c/src/exec/score/cpu/no_cpu/asm.h @@ -33,7 +33,7 @@ #ifndef ASM #define ASM #endif -#include +#include #include /* diff --git a/c/src/exec/score/cpu/sh/asm.h b/c/src/exec/score/cpu/sh/asm.h index f6fff9f40e..446d77b276 100644 --- a/c/src/exec/score/cpu/sh/asm.h +++ b/c/src/exec/score/cpu/sh/asm.h @@ -49,7 +49,7 @@ #define ASM #endif -#include +#include #include /* diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h index 5e9cabb448..f0c3c6f3e5 100644 --- a/c/src/exec/score/include/rtems/system.h +++ b/c/src/exec/score/include/rtems/system.h @@ -28,10 +28,17 @@ extern "C" { */ /* - * FIXME: Instead of targopts.h, cpuopts.h should be included here. - * #include + * FIXME: cpuopts.h should be included here. */ +#if defined(__sh__) \ + || defined(__mc68000__) \ + || defined(__i960__) + /* these cpus are ready to apply cpuopts.h */ +#include +#else + /* fallback to targopts.h */ #include +#endif /* * The following insures that all data is declared in the space diff --git a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am index d4e5619fac..9a6f5f7147 100644 --- a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am @@ -14,6 +14,8 @@ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am +AM_CPPFLAGS += $(BSP_CPPFLAGS) + # # (OPTIONAL) Add local stuff here using += # diff --git a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am index d4e5619fac..7c0b1d1b2a 100644 --- a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am @@ -14,6 +14,7 @@ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am +AM_CPPFLAGS += $(BSP_CPPFLAGS) # # (OPTIONAL) Add local stuff here using += # diff --git a/cpukit/score/cpu/i960/asm.h b/cpukit/score/cpu/i960/asm.h index a9a0788925..e98f900f59 100644 --- a/cpukit/score/cpu/i960/asm.h +++ b/cpukit/score/cpu/i960/asm.h @@ -33,7 +33,7 @@ #ifndef ASM #define ASM #endif -#include +#include #include /* diff --git a/cpukit/score/cpu/m68k/asm.h b/cpukit/score/cpu/m68k/asm.h index 456b213cb2..6c388fb396 100644 --- a/cpukit/score/cpu/m68k/asm.h +++ b/cpukit/score/cpu/m68k/asm.h @@ -33,7 +33,7 @@ #ifndef ASM #define ASM #endif -#include +#include #include /* diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/rtems/asm.h index 456b213cb2..6c388fb396 100644 --- a/cpukit/score/cpu/m68k/rtems/asm.h +++ b/cpukit/score/cpu/m68k/rtems/asm.h @@ -33,7 +33,7 @@ #ifndef ASM #define ASM #endif -#include +#include #include /* diff --git a/cpukit/score/cpu/no_cpu/asm.h b/cpukit/score/cpu/no_cpu/asm.h index 1ca7fd435b..3e9164a28c 100644 --- a/cpukit/score/cpu/no_cpu/asm.h +++ b/cpukit/score/cpu/no_cpu/asm.h @@ -33,7 +33,7 @@ #ifndef ASM #define ASM #endif -#include +#include #include /* diff --git a/cpukit/score/cpu/no_cpu/rtems/asm.h b/cpukit/score/cpu/no_cpu/rtems/asm.h index 1ca7fd435b..3e9164a28c 100644 --- a/cpukit/score/cpu/no_cpu/rtems/asm.h +++ b/cpukit/score/cpu/no_cpu/rtems/asm.h @@ -33,7 +33,7 @@ #ifndef ASM #define ASM #endif -#include +#include #include /* diff --git a/cpukit/score/cpu/sh/asm.h b/cpukit/score/cpu/sh/asm.h index f6fff9f40e..446d77b276 100644 --- a/cpukit/score/cpu/sh/asm.h +++ b/cpukit/score/cpu/sh/asm.h @@ -49,7 +49,7 @@ #define ASM #endif -#include +#include #include /* diff --git a/cpukit/score/cpu/sh/rtems/asm.h b/cpukit/score/cpu/sh/rtems/asm.h index f6fff9f40e..446d77b276 100644 --- a/cpukit/score/cpu/sh/rtems/asm.h +++ b/cpukit/score/cpu/sh/rtems/asm.h @@ -49,7 +49,7 @@ #define ASM #endif -#include +#include #include /* diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h index 5e9cabb448..f0c3c6f3e5 100644 --- a/cpukit/score/include/rtems/system.h +++ b/cpukit/score/include/rtems/system.h @@ -28,10 +28,17 @@ extern "C" { */ /* - * FIXME: Instead of targopts.h, cpuopts.h should be included here. - * #include + * FIXME: cpuopts.h should be included here. */ +#if defined(__sh__) \ + || defined(__mc68000__) \ + || defined(__i960__) + /* these cpus are ready to apply cpuopts.h */ +#include +#else + /* fallback to targopts.h */ #include +#endif /* * The following insures that all data is declared in the space diff --git a/make/custom/dmv152.cfg b/make/custom/dmv152.cfg index 80458060ef..8b38cd4096 100644 --- a/make/custom/dmv152.cfg +++ b/make/custom/dmv152.cfg @@ -19,6 +19,10 @@ RTEMS_BSP_FAMILY=dmv152 CPU_CFLAGS = +# BSP specific preprocessor flags. +# These should only be used in BSP dependent directories. +BSP_CPPFLAGS = -DUSE_CHANNEL_A + # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer @@ -43,8 +47,8 @@ define make-target-options @echo "/* #define NDEBUG 1 */ " >>$@ @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "/* #define RTEMS_DEBUG 1 */" >>$@ - @echo "#define USE_CHANNEL_A 1" >>$@ - @echo "#define USE_CHANNEL_B 0" >>$@ +# @echo "#define USE_CHANNEL_A 1" >>$@ +# @echo "#define USE_CHANNEL_B 0" >>$@ endef # Here is the rule to actually build a $(ARCH)/foo.exe diff --git a/make/custom/mvme167.cfg b/make/custom/mvme167.cfg index ade3c6f68f..889f281bbc 100644 --- a/make/custom/mvme167.cfg +++ b/make/custom/mvme167.cfg @@ -22,6 +22,11 @@ RTEMS_BSP_FAMILY=mvme167 # CPU_CFLAGS = -m68040 -DRTEMS_BSP=$(RTEMS_BSP) + +# BSP specific preprocessor flags. +# These should only be used in BSP dependent directories. +BSP_CPPFLAGS += -DCD2401_INT_LEVEL=1 -DCD2401_POLLED_IO=1 + CFLAGS_DEBUG_V += -ggdb # optimize flag: typically -O, could use -O4 or -fast @@ -49,8 +54,8 @@ define make-target-options @echo "/* #define NDEBUG 1 */ " >>$@ @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "/* #define RTEMS_DEBUG 1 */" >>$@ - @echo "#define CD2401_INT_LEVEL 1" >>$@ - @echo "#define CD2401_POLLED_IO 1" >>$@ +# @echo "#define CD2401_INT_LEVEL 1" >>$@ +# @echo "#define CD2401_POLLED_IO 1" >>$@ endef -- cgit v1.2.3