2001-11-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* custom/ts_386ex.cfg: Remove make-target-options.

4 files changed, 30 insertions, 31 deletions

diff --git a/make/ChangeLog b/make/ChangeLog
index 5c18252ec0..6dba23abbe 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,4 +1,8 @@
 
+2001-11-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	different flags.
+
 2001-11-10	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* custom/shsim.cfg: Remove HZ, BSP_CPPFLAGS, make-target-options.
diff --git a/make/custom/sim68000.cfg b/make/custom/sim68000.cfg
index f5540c9a36..1d00e89442 100644
--- a/make/custom/sim68000.cfg
+++ b/make/custom/sim68000.cfg
@@ -7,14 +7,8 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=m68k
-ifeq ($(RTEMS_BSVC_MODEL),simcpu32)
-RTEMS_CPU_MODEL=mcpu32
-CPU_CFLAGS = -mcpu32
-else  
-RTEMS_BSVC_MODEL=sim68000
 RTEMS_CPU_MODEL=m68000
 CPU_CFLAGS = -m68000
-endif
 
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=sim68000
@@ -26,12 +20,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
 # debugging please
 CFLAGS_DEBUG_V =
 
-#  This section makes the target dependent options file.
-define make-target-options
-	@echo "#undef $(RTEMS_BSVC_MODEL)"               >>$@
-	@echo "#define $(RTEMS_BSVC_MODEL)"              >>$@
-endef
-
 # The following are definitions of make-exe which will work using ld as
 # is currently required.  It is expected that as of gcc 2.8, the end user
 # will be able to override parts of the compilers specs and link using gcc.
diff --git a/make/custom/simcpu32.cfg b/make/custom/simcpu32.cfg
index 8e2be4ca7c..d9c6bcc639 100644
--- a/make/custom/simcpu32.cfg
+++ b/make/custom/simcpu32.cfg
@@ -4,12 +4,32 @@
 #  $Id$
 #
 
-#
-#  All BSVC configurations share the same base file, only the cpu model
-#  differs.
-#  
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
+RTEMS_CPU=m68k
+RTEMS_CPU_MODEL=mcpu32
+CPU_CFLAGS = -mcpu32
+
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=sim68000
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
+
+# debugging please
+CFLAGS_DEBUG_V =
 
-RTEMS_BSVC_MODEL=simcpu32
+# The following are definitions of make-exe which will work using ld as
+# is currently required.  It is expected that as of gcc 2.8, the end user
+# will be able to override parts of the compilers specs and link using gcc.
 
-include $(RTEMS_ROOT)/make/custom/sim68000.cfg
+define make-exe
+	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
+	    -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
+	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).exe
+	$(NM) -g -n $@ > $(basename $@).num
+	$(SIZE) $@
+endef
 
+# Miscellaneous additions go here
diff --git a/make/custom/ts_386ex.cfg b/make/custom/ts_386ex.cfg
index 4294a749aa..1884ebe621 100644
--- a/make/custom/ts_386ex.cfg
+++ b/make/custom/ts_386ex.cfg
@@ -25,19 +25,6 @@ CFLAGS_OPTIMIZE_V= -O4
 
 #  This section makes the target dependent options file.
 
-#  BSP_DEBUG (BSP)
-#     Enables some debugging in the BSP package.
-#
-#  LOAD_RTC_AT_START (BSP)
-#     Initialize RTC and load into system clock at startup. This will break
-#     some tests.
-
-define make-target-options
-	@echo "/* #define UARTDEBUG  1 */"			>>$@
-	@echo "/* #define BSP_DEBUG  1 */"			>>$@
-	@echo "#define LOAD_RTC_AT_START  1"		>>$@
-endef
-
 #  Something like this should produce a map file but this does not work.
 
 #     -Xlinker "-Map $(basename $@).map" $(LINK_OBJS)