From dda8f5dc30edd49de25d2c1ab1ec0fbc5981c1dd Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 27 Nov 2001 23:35:55 +0000
Subject: 2001-11-27	Joel Sherrill <joel@OARcorp.com>,

	This was tracked as PR39.
	* custom/ods68302.cfg: Eliminated required definition of macros in this
	file for the BSP to compile.  The ROM and ROM address and size settings
	are now linker script items.
---
 make/custom/ods68302.cfg | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'make/custom')

diff --git a/make/custom/ods68302.cfg b/make/custom/ods68302.cfg
index dae2801293..0c4bf31a37 100644
--- a/make/custom/ods68302.cfg
+++ b/make/custom/ods68302.cfg
@@ -23,10 +23,6 @@ RTEMS_BSP_FAMILY=ods68302
 # 68000+softfloat results in gcc 2.95.2 giving default libraries. 
 # CPU_CFLAGS = -m68302 -msoft-float
 CPU_CFLAGS = -m68302
-CPU_DEFINES = \
--DVARIANT=$(BSP_VARIANT) -DMC68302_BASE=$(MC68302_BASE) \
--DRAM_BASE=$(RAM_BASE) -DRAM_SIZE=$(RAM_SIZE) \
--DROM_BASE=$(ROM_BASE) -DROM_SIZE=$(ROM_SIZE)
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
@@ -51,25 +47,16 @@ ifeq ($(RTEMS_USE_GCC272),yes)
 # LIBC_LIBM=$(RTEMS_LIBC_DIR)/lib/m68000/libm.a
 
 define make-exe
-	$(LD) $(LDFLAGS) -N -Ttext $(ROM_BASE) \
-	    -defsym MC68302_BASE=$(MC68302_BASE) \
+	$(LD) $(LDFLAGS) -N \
             -T $(LINKCMDS) -o $(basename $@).exe \
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(NM) -g -n $(basename $@).exe > $(basename $@).num
 	$(SIZE) $(basename $@).exe
 endef
 else
+
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
-	    -Wl,-defsym -Wl,MC68302_BASE=$(MC68302_BASE) \
-	    -o $@ \
-	    $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -g -n $@ > $(basename $@).num
-	$(SIZE) $@
-endef
-define make-cxx-exe
-	$(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \
-	    -Wl,-defsym -Wl,MC68302_BASE=$(MC68302_BASE) \
 	    -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(NM) -g -n $@ > $(basename $@).num
@@ -78,24 +65,9 @@ endef
 endif
 # Miscellaneous additions go here
 
-ifeq "$(strip $(BSP_VARIANT))" ""
-BSP_VARIANT=bare
-MC68302_BASE=0x00700000
-RAM_BASE=0x00000000
-RAM_SIZE=0x00100000
-
 ifeq ($(RTEMS_DEBUGGER),yes)
-ROM_BASE=0x00010000
 LINKCMDS=$(PROJECT_RELEASE)/lib/debugrom
 else
-ROM_BASE=0x00C00000
 LINKCMDS=$(PROJECT_RELEASE)/lib/rom
 endif
 
-ROM_SIZE=0x00100000
-
-else
-
-# pattern match the variant to set the memory map
-
-endif
-- 
cgit v1.2.3