From f5642664130154ccaf926625a96b138d5bdebe06 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 2 Aug 2002 00:08:01 +0000
Subject: 2002-08-01	Joel Sherrill <joel@OARcorp.com>

	* eth_comm.cfg, mbx821_001.cfg, mbx860_002.cfg, mbx860_005b.cfg,
	mbx8xx.cfg, mpc8260ads.cfg: Per PR260 removed make-target-options.
---
 make/custom/eth_comm.cfg    |  4 ++--
 make/custom/mbx821_001.cfg  |  1 +
 make/custom/mbx860_002.cfg  |  1 +
 make/custom/mbx860_005b.cfg |  8 +-------
 make/custom/mbx8xx.cfg      | 29 ++---------------------------
 make/custom/mpc8260ads.cfg  |  4 ++--
 6 files changed, 9 insertions(+), 38 deletions(-)

(limited to 'make/custom')

diff --git a/make/custom/eth_comm.cfg b/make/custom/eth_comm.cfg
index 2cef71c88a..c6efcd0568 100644
--- a/make/custom/eth_comm.cfg
+++ b/make/custom/eth_comm.cfg
@@ -8,7 +8,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=powerpc
 RTEMS_CPU_MODEL=mpc8xx
-CPU_TYPE=860
+8XX_CPU_TYPE=860
 
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=eth_comm
@@ -27,7 +27,7 @@ RTEMS_PPC_EXCEPTION_PROCESSING_MODEL=new
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=$(CPU_TYPE) -Dmpc$(CPU_TYPE) \
+CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -Dmpc$(8XX_CPU_TYPE) \
   -DPPC_ABI=PPC_ABI_EABI -DPPC_ASM=PPC_ASM_ELF
 
 # optimize flag: typically -0, could use -O4 or -fast
diff --git a/make/custom/mbx821_001.cfg b/make/custom/mbx821_001.cfg
index 8f8a3327f6..7b3ff2782a 100644
--- a/make/custom/mbx821_001.cfg
+++ b/make/custom/mbx821_001.cfg
@@ -8,5 +8,6 @@
 #  
 
 RTEMS_MBX_MODEL=mbx821_001
+8XX_CPU_TYPE=821
 
 include $(RTEMS_ROOT)/make/custom/mbx8xx.cfg
diff --git a/make/custom/mbx860_002.cfg b/make/custom/mbx860_002.cfg
index 0558456004..2423eebe01 100644
--- a/make/custom/mbx860_002.cfg
+++ b/make/custom/mbx860_002.cfg
@@ -8,5 +8,6 @@
 #  
 
 RTEMS_MBX_MODEL=mbx860_002
+8XX_CPU_TYPE=860
 
 include $(RTEMS_ROOT)/make/custom/mbx8xx.cfg
diff --git a/make/custom/mbx860_005b.cfg b/make/custom/mbx860_005b.cfg
index 61373a0ed7..c9cd82def6 100644
--- a/make/custom/mbx860_005b.cfg
+++ b/make/custom/mbx860_005b.cfg
@@ -8,6 +8,7 @@
 #  
 
 RTEMS_MBX_MODEL=mbx860_005b
+8XX_CPU_TYPE=860
 
 # The 860_005b has 16M ram : org = 0x0, l = 16M 
 MBX8xx_LDFLAGS=-Wl,--defsym -Wl,HeapSize=0x100000
@@ -15,10 +16,3 @@ MBX8xx_LDFLAGS=-Wl,--defsym -Wl,HeapSize=0x100000
 RTEMS_PPC_EXCEPTION_PROCESSING_MODEL=new
 
 include $(RTEMS_ROOT)/make/custom/mbx8xx.cfg
-define make-target-options
-        @echo "#ifdef mpc$(CPU_TYPE)"                       >>$@
-        @echo "#undef mpc$(CPU_TYPE)"                       >>$@
-        @echo "#endif"                                      >>$@
-        @echo "#define mpc$(CPU_TYPE) 1"                    >>$@
-        @echo                                               >>$@
-endef
diff --git a/make/custom/mbx8xx.cfg b/make/custom/mbx8xx.cfg
index 559ceacfc9..61244e3783 100644
--- a/make/custom/mbx8xx.cfg
+++ b/make/custom/mbx8xx.cfg
@@ -10,36 +10,11 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=powerpc
-RTEMS_CPU_MODEL=mpc8xx
+RTEMS_CPU_MODEL=mpc$(8XX_CPU_TYPE)
 
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=mbx8xx
 
-# The value assigned to RTEMS_CPU, RTEMS_CPU_MODEL and RTEMS_BSP get
-# #defined in targopts.h. Source code can switch on these values with #ifdef
-# to select what code to compile for a specific CPU family member and specific
-# board. The RTEMS_CPU_MODEL is also used as the name of the libcpu directory,
-# while the RTEMS_BSP_FAMILY is used as the name of the libbsp directory.
-# For the MBX860 and MBX821, the boards and processors are sufficiently
-# similar that the ports are unified and use RTEMS_CPU_MODEL=mpc8xx and
-# RTEMS_BSP_FAMILY=mbx8xx. Because there are minor differences in the CPUs
-# and the boards, it is necessary to specify them fully during the build.
-# Do a "make RTEMS_BSP=<your_board> <target>" See below for a list of valid
-# values for <your_board>.
-
-ifeq ($(findstring mbx821,$(RTEMS_MBX_MODEL)),mbx821)
-CPU_TYPE=821
-else
-ifeq ($(findstring mbx860,$(RTEMS_MBX_MODEL)),mbx860)
-CPU_TYPE=860
-else
-RTEMS_BSP = mbx860_002
-RTEMS_MBX_MODEL = mbx860_002
-TARGET_ARCH=o-mbx860_002
-CPU_TYPE=860
-endif # mbx860
-endif # mbx821
-
 #  This section makes the target dependent options file.
 #
 #  Note that RTEMS_BSP matches the RTEMS_MBX_MODEL. Its value must be
@@ -68,7 +43,7 @@ endif # mbx821
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS = -mcpu=$(CPU_TYPE) -Dmpc$(CPU_TYPE) -D$(RTEMS_MBX_MODEL)
+CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -Dmpc$(8XX_CPU_TYPE) -D$(RTEMS_MBX_MODEL)
 
 CFLAGS_DEBUG_V += -ggdb
 CXXFLAGS_DEBUG_V += -ggdb
diff --git a/make/custom/mpc8260ads.cfg b/make/custom/mpc8260ads.cfg
index b302b53f8f..ea0623982f 100644
--- a/make/custom/mpc8260ads.cfg
+++ b/make/custom/mpc8260ads.cfg
@@ -8,7 +8,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=powerpc
 RTEMS_CPU_MODEL=mpc8260
-CPU_TYPE=8260
+8XX_CPU_TYPE=8260
 
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=mpc8260ads
@@ -25,7 +25,7 @@ RTEMS_BSP_FAMILY=mpc8260ads
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-# CPU_CFLAGS = -mcpu=$(CPU_TYPE) -mstrict-align
+# CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -mstrict-align
 CPU_CFLAGS = -mcpu=603e -mstrict-align -Dmpc8260 \
   -DPPC_ABI=PPC_ABI_EABI -DPPC_ASM=PPC_ASM_ELF
 
-- 
cgit v1.2.3