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/mbx8xx.cfg | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'make/custom/mbx8xx.cfg')

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
-- 
cgit v1.2.3