From f59f648917ac08c87b2a883fdcf4c4660a901aa8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 1 Oct 2008 06:42:48 +0000 Subject: Back out parts of yesterdays changes. --- make/custom/brs5l.cfg | 1 + make/custom/gen5200.cfg | 3 ++- make/custom/gen83xx.cfg | 4 ++-- make/custom/genmcf548x.cfg | 2 +- make/custom/hsc_cm01.cfg | 1 + make/custom/icecube.cfg | 1 + make/custom/m5484FireEngine.cfg | 2 ++ make/custom/mpc5566evb.cfg | 2 ++ make/custom/mpc55xx.cfg | 2 +- make/custom/mpc8313erdb.cfg | 1 + make/custom/mpc8349eamds.cfg | 1 + make/custom/pgh360.cfg | 3 ++- make/custom/pghplus.cfg | 1 + make/custom/pm520_cr825.cfg | 1 + make/custom/pm520_ze30.cfg | 1 + make/custom/tqm8xx.cfg | 2 +- make/custom/tqm8xx_stk8xx.cfg | 1 + 17 files changed, 22 insertions(+), 7 deletions(-) diff --git a/make/custom/brs5l.cfg b/make/custom/brs5l.cfg index ffb1612f21..1e403f0618 100644 --- a/make/custom/brs5l.cfg +++ b/make/custom/brs5l.cfg @@ -9,6 +9,7 @@ # 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 d889eb2ba3..39cdc313c1 100644 --- a/make/custom/gen5200.cfg +++ b/make/custom/gen5200.cfg @@ -16,7 +16,8 @@ RTEMS_BSP_FAMILY=gen5200 # and (hopefully) optimize for it. # CPU_CFLAGS = -mcpu=603e -mstrict-align \ - -meabi -msdata -fno-common + -meabi -msdata -fno-common \ + -D$(RTEMS_BOARD_MODEL) # 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 34c85d4e98..d8faa53327 100644 --- a/make/custom/gen83xx.cfg +++ b/make/custom/gen83xx.cfg @@ -21,9 +21,9 @@ RTEMS_BSP_FAMILY=gen83xx # CPU_CFLAGS = -mcpu=603e -mstrict-align -fno-strict-aliasing \ -meabi -msdata -fno-common \ - -D$(RTEMS_83XX_DERIVATE) + -D$(RTEMS_BOARD_MODEL) -D$(RTEMS_83XX_DERIVATE) # optimize flag: typically -O2 -CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions -funit-at-a-time +CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions -funit-at-a-time -W -Wno-unused LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS) diff --git a/make/custom/genmcf548x.cfg b/make/custom/genmcf548x.cfg index 9bf0722db0..480a7a4c40 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 -Wa,-memac +CPU_CFLAGS = -mcfv4e -D$(RTEMS_BOARD_MODEL) -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 c2a48447f6..bb0cbe49d6 100644 --- a/make/custom/hsc_cm01.cfg +++ b/make/custom/hsc_cm01.cfg @@ -9,6 +9,7 @@ # 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 3ad22c37f7..78d8e442f0 100644 --- a/make/custom/icecube.cfg +++ b/make/custom/icecube.cfg @@ -12,6 +12,7 @@ # parameters differ. # +RTEMS_BOARD_MODEL=icecube RTEMS_LINKCMDS=linkcmds.icecube include $(RTEMS_ROOT)/make/custom/gen5200.cfg diff --git a/make/custom/m5484FireEngine.cfg b/make/custom/m5484FireEngine.cfg index cfc8bdaee8..0e64134515 100644 --- a/make/custom/m5484FireEngine.cfg +++ b/make/custom/m5484FireEngine.cfg @@ -9,6 +9,8 @@ # parameters differ. # +RTEMS_BOARD_MODEL=M5484FIREENGINE +RTEMS_54XX_DERIVATE=MCF5484 RTEMS_LINKCMDS=linkcmds include $(RTEMS_ROOT)/make/custom/genmcf548x.cfg diff --git a/make/custom/mpc5566evb.cfg b/make/custom/mpc5566evb.cfg index 1272791f24..f2683427c6 100644 --- a/make/custom/mpc5566evb.cfg +++ b/make/custom/mpc5566evb.cfg @@ -7,4 +7,6 @@ # @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 007ff65c65..a178903206 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__ppc_generic -mstrict-align -D$(RTEMS_BOARD_MODEL) CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions diff --git a/make/custom/mpc8313erdb.cfg b/make/custom/mpc8313erdb.cfg index 896c054cbd..81b3b81301 100644 --- a/make/custom/mpc8313erdb.cfg +++ b/make/custom/mpc8313erdb.cfg @@ -7,6 +7,7 @@ # @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 f2760dcad5..66ef9356d5 100644 --- a/make/custom/mpc8349eamds.cfg +++ b/make/custom/mpc8349eamds.cfg @@ -9,6 +9,7 @@ # 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 a12ac1d374..0a9c206b9b 100644 --- a/make/custom/pgh360.cfg +++ b/make/custom/pgh360.cfg @@ -6,6 +6,7 @@ RTEMS_CPU=m68k RTEMS_CPU_MODEL=m68360 +RTEMS_BOARD_MODEL=PGH360 include $(RTEMS_ROOT)/make/custom/default.cfg @@ -14,7 +15,7 @@ RTEMS_BSP_FAMILY=gen68360 # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. -CPU_CFLAGS = -mcpu32 +CPU_CFLAGS = -mcpu32 -D$(RTEMS_BOARD_MODEL) # optimize flag: typically -O2 CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer diff --git a/make/custom/pghplus.cfg b/make/custom/pghplus.cfg index dc0fcb3c18..ca1925dc11 100644 --- a/make/custom/pghplus.cfg +++ b/make/custom/pghplus.cfg @@ -7,4 +7,5 @@ # parameters differ. # +RTEMS_TQM_MODEL=pghplus include $(RTEMS_ROOT)/make/custom/tqm8xx.cfg diff --git a/make/custom/pm520_cr825.cfg b/make/custom/pm520_cr825.cfg index fd84c4b18c..8e9ae59b6a 100644 --- a/make/custom/pm520_cr825.cfg +++ b/make/custom/pm520_cr825.cfg @@ -10,6 +10,7 @@ # 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 5aa3de0354..ef9bd407ba 100644 --- a/make/custom/pm520_ze30.cfg +++ b/make/custom/pm520_ze30.cfg @@ -10,6 +10,7 @@ # parameters differ. # +RTEMS_BOARD_MODEL=PM520_ZE30 RTEMS_LINKCMDS=linkcmds.pm520 include $(RTEMS_ROOT)/make/custom/gen5200.cfg diff --git a/make/custom/tqm8xx.cfg b/make/custom/tqm8xx.cfg index 5e4faa251b..12c6820be7 100644 --- a/make/custom/tqm8xx.cfg +++ b/make/custom/tqm8xx.cfg @@ -10,7 +10,7 @@ RTEMS_CPU_MODEL=mpc860 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=tqm8xx -CPU_CFLAGS = -mcpu=860 -Dmpc860 \ +CPU_CFLAGS = -mcpu=860 -Dmpc860 -D$(RTEMS_TQM_MODEL) \ -mstrict-align -fno-strict-aliasing \ -meabi -msdata -fno-common diff --git a/make/custom/tqm8xx_stk8xx.cfg b/make/custom/tqm8xx_stk8xx.cfg index 856df7c3ec..5ca7c3778b 100644 --- a/make/custom/tqm8xx_stk8xx.cfg +++ b/make/custom/tqm8xx_stk8xx.cfg @@ -7,4 +7,5 @@ # parameters differ. # +RTEMS_TQM_MODEL=tqm8xx_stk8xx include $(RTEMS_ROOT)/make/custom/tqm8xx.cfg -- cgit v1.2.3