summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-27 23:35:55 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-27 23:35:55 +0000
commitdda8f5dc30edd49de25d2c1ab1ec0fbc5981c1dd (patch)
tree07bb4c91e5fc5779407ea0d1a42e866729473aa2
parent3f381864a5ef7197de8f0fe9c4bbd7f978b18ff8 (diff)
downloadrtems-dda8f5dc30edd49de25d2c1ab1ec0fbc5981c1dd.tar.bz2
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.
Diffstat (limited to '')
-rw-r--r--make/ChangeLog6
-rw-r--r--make/custom/ods68302.cfg32
2 files changed, 8 insertions, 30 deletions
diff --git a/make/ChangeLog b/make/ChangeLog
index c06aa7f542..3106069a5d 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,9 @@
+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.
2001-11-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
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