Changeset 270e3cc in rtems


Ignore:
Timestamp:
Jul 11, 2000, 2:56:04 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
9e52b29
Parents:
ebb0bb92
Message:

Patch rtems-rc-20000711-1-cvs.diff from Ralf Corsepius <corsepiu@…>
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.

Files:
17 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/cpu/i960/asm.h

    rebb0bb92 r270e3cc  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/i960.h>
    3838
  • c/src/exec/score/cpu/m68k/asm.h

    rebb0bb92 r270e3cc  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/cpu.h>
    3838
  • c/src/exec/score/cpu/no_cpu/asm.h

    rebb0bb92 r270e3cc  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/no_cpu.h>
    3838
  • c/src/exec/score/cpu/sh/asm.h

    rebb0bb92 r270e3cc  
    5050#endif
    5151
    52 #include <rtems/score/targopts.h>
     52#include <rtems/score/cpuopts.h>
    5353#include <rtems/score/sh.h>
    5454
  • c/src/exec/score/include/rtems/system.h

    rebb0bb92 r270e3cc  
    2929
    3030/*
    31  * FIXME: Instead of targopts.h, cpuopts.h should be included here.
    32  * #include <rtems/score/cpuopts.h>
    33  */
     31 * FIXME: cpuopts.h should be included here.
     32 */
     33#if defined(__sh__) \
     34  || defined(__mc68000__) \
     35  || defined(__i960__)
     36  /* these cpus are ready to apply cpuopts.h */
     37#include <rtems/score/cpuopts.h>
     38#else
     39  /* fallback to targopts.h */
    3440#include <rtems/score/targopts.h>
     41#endif
    3542
    3643/*
  • c/src/lib/libbsp/m68k/dmv152/console/Makefile.am

    rebb0bb92 r270e3cc  
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    1515include $(top_srcdir)/../../../../../../automake/lib.am
     16
     17AM_CPPFLAGS += $(BSP_CPPFLAGS)
    1618
    1719#
  • c/src/lib/libbsp/m68k/mvme167/console/Makefile.am

    rebb0bb92 r270e3cc  
    1515include $(top_srcdir)/../../../../../../automake/lib.am
    1616
     17AM_CPPFLAGS += $(BSP_CPPFLAGS)
    1718#
    1819# (OPTIONAL) Add local stuff here using +=
  • cpukit/score/cpu/i960/asm.h

    rebb0bb92 r270e3cc  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/i960.h>
    3838
  • cpukit/score/cpu/m68k/asm.h

    rebb0bb92 r270e3cc  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/cpu.h>
    3838
  • cpukit/score/cpu/m68k/rtems/asm.h

    rebb0bb92 r270e3cc  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/cpu.h>
    3838
  • cpukit/score/cpu/no_cpu/asm.h

    rebb0bb92 r270e3cc  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/no_cpu.h>
    3838
  • cpukit/score/cpu/no_cpu/rtems/asm.h

    rebb0bb92 r270e3cc  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/no_cpu.h>
    3838
  • cpukit/score/cpu/sh/asm.h

    rebb0bb92 r270e3cc  
    5050#endif
    5151
    52 #include <rtems/score/targopts.h>
     52#include <rtems/score/cpuopts.h>
    5353#include <rtems/score/sh.h>
    5454
  • cpukit/score/cpu/sh/rtems/asm.h

    rebb0bb92 r270e3cc  
    5050#endif
    5151
    52 #include <rtems/score/targopts.h>
     52#include <rtems/score/cpuopts.h>
    5353#include <rtems/score/sh.h>
    5454
  • cpukit/score/include/rtems/system.h

    rebb0bb92 r270e3cc  
    2929
    3030/*
    31  * FIXME: Instead of targopts.h, cpuopts.h should be included here.
    32  * #include <rtems/score/cpuopts.h>
    33  */
     31 * FIXME: cpuopts.h should be included here.
     32 */
     33#if defined(__sh__) \
     34  || defined(__mc68000__) \
     35  || defined(__i960__)
     36  /* these cpus are ready to apply cpuopts.h */
     37#include <rtems/score/cpuopts.h>
     38#else
     39  /* fallback to targopts.h */
    3440#include <rtems/score/targopts.h>
     41#endif
    3542
    3643/*
  • make/custom/dmv152.cfg

    rebb0bb92 r270e3cc  
    1919
    2020CPU_CFLAGS =
     21
     22# BSP specific preprocessor flags.
     23# These should only be used in BSP dependent directories.
     24BSP_CPPFLAGS = -DUSE_CHANNEL_A
    2125
    2226# optimize flag: typically -0, could use -O4 or -fast
     
    4448        @echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
    4549        @echo "/* #define RTEMS_DEBUG  1 */"                >>$@
    46         @echo "#define USE_CHANNEL_A  1"                    >>$@
    47         @echo "#define USE_CHANNEL_B  0"                    >>$@
     50#       @echo "#define USE_CHANNEL_A  1"                    >>$@
     51#       @echo "#define USE_CHANNEL_B  0"                    >>$@
    4852endef
    4953
  • make/custom/mvme167.cfg

    rebb0bb92 r270e3cc  
    2323
    2424CPU_CFLAGS = -m68040 -DRTEMS_BSP=$(RTEMS_BSP)
     25
     26# BSP specific preprocessor flags.
     27# These should only be used in BSP dependent directories.
     28BSP_CPPFLAGS += -DCD2401_INT_LEVEL=1 -DCD2401_POLLED_IO=1
     29 
    2530CFLAGS_DEBUG_V += -ggdb
    2631
     
    5055        @echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
    5156        @echo "/* #define RTEMS_DEBUG  1 */"                >>$@
    52         @echo "#define CD2401_INT_LEVEL 1"                  >>$@
    53         @echo "#define CD2401_POLLED_IO 1"                  >>$@
     57#       @echo "#define CD2401_INT_LEVEL 1"                  >>$@
     58#       @echo "#define CD2401_POLLED_IO 1"                  >>$@
    5459       
    5560       
Note: See TracChangeset for help on using the changeset viewer.