15 files changed, 5 insertions, 19 deletions
diff --git a/make/custom/brs5l.cfg b/make/custom/brs5l.cfg
index 1e403f0618..ffb1612f21 100644
--- a/make/custom/brs5l.cfg
+++ b/make/custom/brs5l.cfg
@@ -9,7 +9,6 @@
 #  parameters differ.
 #  
 
-RTEMS_BOARD_MODEL=BRS5L
 RTEMS_LINKCMDS=linkcmds.brs5l
 
 include $(RTEMS_ROOT)/make/custom/gen5200.cfg
diff --git a/make/custom/gen5200.cfg b/make/custom/gen5200.cfg
index 39cdc313c1..d889eb2ba3 100644
--- a/make/custom/gen5200.cfg
+++ b/make/custom/gen5200.cfg
@@ -16,8 +16,7 @@ RTEMS_BSP_FAMILY=gen5200
 #  and (hopefully) optimize for it. 
 #
 CPU_CFLAGS = -mcpu=603e -mstrict-align \
-             -meabi -msdata -fno-common \
-             -D$(RTEMS_BOARD_MODEL)
+             -meabi -msdata -fno-common
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
diff --git a/make/custom/gen83xx.cfg b/make/custom/gen83xx.cfg
index d8faa53327..ffd4b6cf13 100644
--- a/make/custom/gen83xx.cfg
+++ b/make/custom/gen83xx.cfg
@@ -21,7 +21,7 @@ RTEMS_BSP_FAMILY=gen83xx
 #
 CPU_CFLAGS = -mcpu=603e -mstrict-align -fno-strict-aliasing \
              -meabi -msdata -fno-common \
-             -D$(RTEMS_BOARD_MODEL) -D$(RTEMS_83XX_DERIVATE)
+             -D$(RTEMS_83XX_DERIVATE)
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions -funit-at-a-time -W -Wno-unused
diff --git a/make/custom/genmcf548x.cfg b/make/custom/genmcf548x.cfg
index 480a7a4c40..9bf0722db0 100644
--- a/make/custom/genmcf548x.cfg
+++ b/make/custom/genmcf548x.cfg
@@ -12,7 +12,7 @@ RTEMS_BSP_FAMILY=genmcf548x
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
-CPU_CFLAGS = -mcfv4e -D$(RTEMS_BOARD_MODEL) -Wa,-memac
+CPU_CFLAGS = -mcfv4e -Wa,-memac
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer 
diff --git a/make/custom/hsc_cm01.cfg b/make/custom/hsc_cm01.cfg
index bb0cbe49d6..c2a48447f6 100644
--- a/make/custom/hsc_cm01.cfg
+++ b/make/custom/hsc_cm01.cfg
@@ -9,7 +9,6 @@
 #  parameters differ.
 #  
 
-RTEMS_BOARD_MODEL=HSC_CM01
 RTEMS_83XX_DERIVATE=MPC8349
 RTEMS_LINKCMDS=linkcmds.hsc_cm01
 
diff --git a/make/custom/icecube.cfg b/make/custom/icecube.cfg
index 78d8e442f0..3ad22c37f7 100644
--- a/make/custom/icecube.cfg
+++ b/make/custom/icecube.cfg
@@ -12,7 +12,6 @@
 #  parameters differ.
 #  
 
-RTEMS_BOARD_MODEL=icecube
 RTEMS_LINKCMDS=linkcmds.icecube
 
 include $(RTEMS_ROOT)/make/custom/gen5200.cfg
diff --git a/make/custom/lpc2478.cfg b/make/custom/lpc2478.cfg
index a86b9ac9dc..4ccacfe70d 100644
--- a/make/custom/lpc2478.cfg
+++ b/make/custom/lpc2478.cfg
@@ -8,10 +8,8 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU = arm
 RTEMS_BSP_FAMILY = lpc24xx
-RTEMS_BOARD_MODEL = LPC2478
 
 CPU_CFLAGS = -mcpu=arm7tdmi -mstructure-size-boundary=8 -mapcs-frame \
-	-D$(RTEMS_BOARD_MODEL) \
 	-Wextra -Wno-unused -Wpointer-arith -Wcast-qual -Wconversion -Wmissing-prototypes
 
 CFLAGS_OPTIMIZE_V = -Os -g
diff --git a/make/custom/m5484FireEngine.cfg b/make/custom/m5484FireEngine.cfg
index 0e64134515..d7a8b281e8 100644
--- a/make/custom/m5484FireEngine.cfg
+++ b/make/custom/m5484FireEngine.cfg
@@ -9,7 +9,6 @@
 #  parameters differ.
 #  
 
-RTEMS_BOARD_MODEL=M5484FIREENGINE
 RTEMS_54XX_DERIVATE=MCF5484
 RTEMS_LINKCMDS=linkcmds
 
diff --git a/make/custom/mpc5566evb.cfg b/make/custom/mpc5566evb.cfg
index f2683427c6..1272791f24 100644
--- a/make/custom/mpc5566evb.cfg
+++ b/make/custom/mpc5566evb.cfg
@@ -7,6 +7,4 @@
 # @brief Configuration file for MPC5566 evaluation board.
 #
 
-RTEMS_BOARD_MODEL = MPC5566EVB
-
 include $(RTEMS_ROOT)/make/custom/mpc55xx.cfg
diff --git a/make/custom/mpc55xx.cfg b/make/custom/mpc55xx.cfg
index a178903206..007ff65c65 100644
--- a/make/custom/mpc55xx.cfg
+++ b/make/custom/mpc55xx.cfg
@@ -17,6 +17,6 @@ RTEMS_BSP_FAMILY = mpc55xxevb
 
 # FIXME
 CPU_CFLAGS = -mcpu=8540 -meabi -msdata -fno-common -funit-at-a-time \
-    -D__ppc_generic -mstrict-align -D$(RTEMS_BOARD_MODEL)
+    -D__ppc_generic -mstrict-align
 
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
diff --git a/make/custom/mpc8313erdb.cfg b/make/custom/mpc8313erdb.cfg
index 81b3b81301..896c054cbd 100644
--- a/make/custom/mpc8313erdb.cfg
+++ b/make/custom/mpc8313erdb.cfg
@@ -7,7 +7,6 @@
 # @brief Configuration file for the MPC8313E Reference Design Board.
 #
 
-RTEMS_BOARD_MODEL=MPC8313ERDB
 RTEMS_83XX_DERIVATE=MPC8349
 RTEMS_LINKCMDS=linkcmds.mpc8313erdb
 
diff --git a/make/custom/mpc8349eamds.cfg b/make/custom/mpc8349eamds.cfg
index 66ef9356d5..f2760dcad5 100644
--- a/make/custom/mpc8349eamds.cfg
+++ b/make/custom/mpc8349eamds.cfg
@@ -9,7 +9,6 @@
 #  parameters differ.
 #  
 
-RTEMS_BOARD_MODEL=MPC8349EAMDS
 RTEMS_83XX_DERIVATE=MPC8349
 RTEMS_LINKCMDS=linkcmds.mpc8349eamds
 
diff --git a/make/custom/pgh360.cfg b/make/custom/pgh360.cfg
index 0a9c206b9b..a12ac1d374 100644
--- a/make/custom/pgh360.cfg
+++ b/make/custom/pgh360.cfg
@@ -6,7 +6,6 @@
 
 RTEMS_CPU=m68k
 RTEMS_CPU_MODEL=m68360
-RTEMS_BOARD_MODEL=PGH360
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
@@ -15,7 +14,7 @@ RTEMS_BSP_FAMILY=gen68360
 
 # This contains the compiler options necessary to select the CPU model
 # and (hopefully) optimize for it.
-CPU_CFLAGS = -mcpu32 -D$(RTEMS_BOARD_MODEL)
+CPU_CFLAGS = -mcpu32
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer
diff --git a/make/custom/pm520_cr825.cfg b/make/custom/pm520_cr825.cfg
index 8e9ae59b6a..fd84c4b18c 100644
--- a/make/custom/pm520_cr825.cfg
+++ b/make/custom/pm520_cr825.cfg
@@ -10,7 +10,6 @@
 #  parameters differ.
 #  
 
-RTEMS_BOARD_MODEL=PM520_CR825
 RTEMS_LINKCMDS=linkcmds.pm520
 
 include $(RTEMS_ROOT)/make/custom/gen5200.cfg
diff --git a/make/custom/pm520_ze30.cfg b/make/custom/pm520_ze30.cfg
index ef9bd407ba..5aa3de0354 100644
--- a/make/custom/pm520_ze30.cfg
+++ b/make/custom/pm520_ze30.cfg
@@ -10,7 +10,6 @@
 #  parameters differ.
 #  
 
-RTEMS_BOARD_MODEL=PM520_ZE30
 RTEMS_LINKCMDS=linkcmds.pm520
 
 include $(RTEMS_ROOT)/make/custom/gen5200.cfg