12 files changed, 12 insertions, 232 deletions
diff --git a/c/src/exec/score/cpu/a29k/a29k.h b/c/src/exec/score/cpu/a29k/a29k.h
index f948abe5e4..aa567d8f1f 100644
--- a/c/src/exec/score/cpu/a29k/a29k.h
+++ b/c/src/exec/score/cpu/a29k/a29k.h
@@ -20,28 +20,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef a29k
-#undef a29k
-#endif
-#define a29k
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
- 
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-/*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "no cpu"
  *  family when executing in protected mode.  It does
diff --git a/c/src/exec/score/cpu/hppa1.1/hppa.h b/c/src/exec/score/cpu/hppa1.1/hppa.h
index 87ba027aab..77f25d76e6 100644
--- a/c/src/exec/score/cpu/hppa1.1/hppa.h
+++ b/c/src/exec/score/cpu/hppa1.1/hppa.h
@@ -32,28 +32,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef hppa1_1
-#undef hppa1_1
-#endif
-#define hppa1_1
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-/*
  *  This section contains the information required to build
  *  RTEMS for a particular member of the Hewlett Packard
  *  PA-RISC family.  It does this by setting variables to
diff --git a/c/src/exec/score/cpu/i386/i386.h b/c/src/exec/score/cpu/i386/i386.h
index f53d2982e9..2b6ca27b8e 100644
--- a/c/src/exec/score/cpu/i386/i386.h
+++ b/c/src/exec/score/cpu/i386/i386.h
@@ -22,28 +22,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
-
-#ifdef i386
-#undef i386
-#endif
-#define i386 1
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-/*
  *  This section contains the information required to build
  *  RTEMS for a particular member of the Intel i386
  *  family when executing in protected mode.  It does
diff --git a/c/src/exec/score/cpu/i960/i960.h b/c/src/exec/score/cpu/i960/i960.h
index 5c8a570736..33a4e9b7fe 100644
--- a/c/src/exec/score/cpu/i960/i960.h
+++ b/c/src/exec/score/cpu/i960/i960.h
@@ -22,28 +22,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef i960
-#undef i960
-#endif
-#define i960
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-/*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the Intel i960
  *  family.  It does this by setting variables to indicate
diff --git a/c/src/exec/score/cpu/m68k/m68k.h b/c/src/exec/score/cpu/m68k/m68k.h
index c28e85df56..feee5052b4 100644
--- a/c/src/exec/score/cpu/m68k/m68k.h
+++ b/c/src/exec/score/cpu/m68k/m68k.h
@@ -22,28 +22,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef m68k
-#undef m68k
-#endif
-#define m68k
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-/*
  *  This section contains the information required to build
  *  RTEMS for a particular member of the Motorola MC68xxx
  *  family.  It does this by setting variables to indicate
diff --git a/c/src/exec/score/cpu/mips64orion/mips64orion.h b/c/src/exec/score/cpu/mips64orion/mips64orion.h
index c65b99d965..53483cc82d 100644
--- a/c/src/exec/score/cpu/mips64orion/mips64orion.h
+++ b/c/src/exec/score/cpu/mips64orion/mips64orion.h
@@ -36,28 +36,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef mips64orion
-#undef mips64orion
-#endif
-#define mips64orion
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
- 
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-/*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "no cpu"
  *  family when executing in protected mode.  It does
diff --git a/c/src/exec/score/cpu/no_cpu/no_cpu.h b/c/src/exec/score/cpu/no_cpu/no_cpu.h
index afc3a46571..aff0d046b7 100644
--- a/c/src/exec/score/cpu/no_cpu/no_cpu.h
+++ b/c/src/exec/score/cpu/no_cpu/no_cpu.h
@@ -23,28 +23,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef no_cpu
-#undef no_cpu
-#endif
-#define no_cpu
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
- 
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-/*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "no cpu"
  *  family when executing in protected mode.  It does
diff --git a/c/src/exec/score/cpu/powerpc/ppc.h b/c/src/exec/score/cpu/powerpc/ppc.h
index c05760ed53..09b19a208e 100644
--- a/c/src/exec/score/cpu/powerpc/ppc.h
+++ b/c/src/exec/score/cpu/powerpc/ppc.h
@@ -42,28 +42,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef ppc
-#undef ppc
-#endif
-#define ppc
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
- 
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-/*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "no cpu"
  *  family when executing in protected mode.  It does
diff --git a/c/src/exec/score/cpu/unix/unix.h b/c/src/exec/score/cpu/unix/unix.h
index bb5011b41b..318c21ca5e 100644
--- a/c/src/exec/score/cpu/unix/unix.h
+++ b/c/src/exec/score/cpu/unix/unix.h
@@ -22,38 +22,6 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef unix
-#undef unix
-#endif
-#define unix
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_FAMILY
-#undef REPLACE_THIS_WITH_THE_CPU_FAMILY
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_FAMILY
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_UNIX_FLAVOR
-#undef REPLACE_THIS_WITH_THE_UNIX_FLAVOR
-#endif
-#define REPLACE_THIS_WITH_THE_UNIX_FLAVOR
-
-/*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "unix"
  *  family when executing in protected mode.  It does
diff --git a/c/src/exec/score/headers/system.h b/c/src/exec/score/headers/system.h
index 74929eade6..4e048d582b 100644
--- a/c/src/exec/score/headers/system.h
+++ b/c/src/exec/score/headers/system.h
@@ -23,16 +23,12 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_USE_INLINE_OR_MACROS" is replaced
- *        with either "USE_INLINES" or "USE_MACROS" based upon the
- *        whether this target configuration uses the inline or
- *        macro implementations of the inlined RTEMS routines.
+ *  The target options include file defines all target dependent 
+ *  parameters for this build of RTEMS.  It must be included
+ *  first so the basic macro definitions are in place.
  */
- 
 
-#define REPLACE_THIS_WITH_USE_INLINE_OR_MACROS
+#include <rtems/score/targopts.h>
 
 /*
  *  The following insures that all data is declared in the space
diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h
index 74929eade6..4e048d582b 100644
--- a/c/src/exec/score/include/rtems/system.h
+++ b/c/src/exec/score/include/rtems/system.h
@@ -23,16 +23,12 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_USE_INLINE_OR_MACROS" is replaced
- *        with either "USE_INLINES" or "USE_MACROS" based upon the
- *        whether this target configuration uses the inline or
- *        macro implementations of the inlined RTEMS routines.
+ *  The target options include file defines all target dependent 
+ *  parameters for this build of RTEMS.  It must be included
+ *  first so the basic macro definitions are in place.
  */
- 
 
-#define REPLACE_THIS_WITH_USE_INLINE_OR_MACROS
+#include <rtems/score/targopts.h>
 
 /*
  *  The following insures that all data is declared in the space
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index 74929eade6..4e048d582b 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -23,16 +23,12 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_USE_INLINE_OR_MACROS" is replaced
- *        with either "USE_INLINES" or "USE_MACROS" based upon the
- *        whether this target configuration uses the inline or
- *        macro implementations of the inlined RTEMS routines.
+ *  The target options include file defines all target dependent 
+ *  parameters for this build of RTEMS.  It must be included
+ *  first so the basic macro definitions are in place.
  */
- 
 
-#define REPLACE_THIS_WITH_USE_INLINE_OR_MACROS
+#include <rtems/score/targopts.h>
 
 /*
  *  The following insures that all data is declared in the space