summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-12-18 14:11:02 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-12-18 14:11:02 +0000
commitc2b12f2461beeadd67fcc6f8c28fbe0397f5cc0f (patch)
treeb9270a39936c61e9b9daa133aae5b90eea91eb5a /make
parentac43f07025f638968a591cf31626ce2c66684448 (diff)
downloadrtems-c2b12f2461beeadd67fcc6f8c28fbe0397f5cc0f.tar.bz2
2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* custom/armulator.cfg: Remove make-target-options. * custom/erc32.cfg: Remove CONSOLE_USE_INTERRUPTS, SIMSPARC_FAST_IDLE (now in erc32/configure.ac). * custom/leon2.cfg: Remove CONSOLE_USE_INTERRUPTS, SIMSPARC_FAST_IDLE (now in leon2/configure.ac). Remove CONSOLE_USE_POLLED (Unused). * custom/mvme167.cfg: Remove CD2401_INT_LEVEL, CD2401_IO_MODE, CD2401_USE_TERMIOS (now in mvme167/configure.ac). * custom/mvme162.cfg: Remove references to mvme162lx. Abandon gcc272. Remove make-target-options. * custom/mvme162lx.cfg: Add portions formerly in mvme162.cfg.
Diffstat (limited to 'make')
-rw-r--r--make/ChangeLog14
-rw-r--r--make/custom/armulator.cfg2
-rw-r--r--make/custom/erc32.cfg16
-rw-r--r--make/custom/leon2.cfg17
-rw-r--r--make/custom/mvme162.cfg43
-rw-r--r--make/custom/mvme162lx.cfg36
-rw-r--r--make/custom/mvme167.cfg8
7 files changed, 51 insertions, 85 deletions
diff --git a/make/ChangeLog b/make/ChangeLog
index 4d48917037..132edfd3f2 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,17 @@
+2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * custom/armulator.cfg: Remove make-target-options.
+ * custom/erc32.cfg: Remove CONSOLE_USE_INTERRUPTS, SIMSPARC_FAST_IDLE
+ (now in erc32/configure.ac).
+ * custom/leon2.cfg: Remove CONSOLE_USE_INTERRUPTS,
+ SIMSPARC_FAST_IDLE (now in leon2/configure.ac).
+ Remove CONSOLE_USE_POLLED (Unused).
+ * custom/mvme167.cfg: Remove CD2401_INT_LEVEL, CD2401_IO_MODE,
+ CD2401_USE_TERMIOS (now in mvme167/configure.ac).
+ * custom/mvme162.cfg: Remove references to mvme162lx.
+ Abandon gcc272. Remove make-target-options.
+ * custom/mvme162lx.cfg: Add portions formerly in mvme162.cfg.
+
2001-12-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* custom/bare.cfg: Remove make-target-options.
diff --git a/make/custom/armulator.cfg b/make/custom/armulator.cfg
index e5b6210f62..941b950a88 100644
--- a/make/custom/armulator.cfg
+++ b/make/custom/armulator.cfg
@@ -12,8 +12,6 @@ RTEMS_CPU_MODEL=arm7tdmi
# This is the actual bsp directory used during the build process.
RTEMS_BSP_FAMILY=armulator
-# This section makes the target dependent options file.
-
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
#
diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg
index 32d6d82dff..a0e6735861 100644
--- a/make/custom/erc32.cfg
+++ b/make/custom/erc32.cfg
@@ -38,30 +38,16 @@ CFLAGS_OPTIMIZE_V=-O4
# NO_TABLE_MOVE (SPARC PORT)
# do not have a second trap table -- use the BSP's
#
-# CONSOLE_USE_INTERRUPTS (erc32_bsp)
-# The erc32 console driver can operate in either polled or interrupt mode.
-# Under the simulator (especially when FAST_UART is defined), polled seems
-# to operate better. It is common for a task to print a line (like the
-# end of test message) and then exit. In this case, the program returns
-# control to the simulator command line before the program has even queued
-# the output to the uart. Thus sis has no chance of getting the data out.
-#
-# SIMSPARC_FAST_IDLE (erc32_bsp)
-# If defined, speed up the clock ticks while the idle task is running so
-# time spent in the idle task is minimized. This significantly reduces
-# the wall time required to execute the RTEMS test suites.
-#
# FPU_REVB (erc32_bsp)
# If defined, enables work-around for bug 3.14 in FPU rev.B or rev.C
#
-# CPU_U32_FIX (all)
+# CPU_U32_FIX (all) libchip/network/sonic.*
# Needed to align received TCP/IP packets since SPARC does not
# support unaligned memory access.
#
define make-target-options
@echo "#define NO_TABLE_MOVE 1" >>$@
- @echo "/* #define SIMSPARC_FAST_IDLE 1 */" >>$@
@echo "/* #define FPU_REVB 1 */" >>$@
@echo "#define CPU_U32_FIX 1" >>$@
endef
diff --git a/make/custom/leon2.cfg b/make/custom/leon2.cfg
index c88f4de632..4493bea5c4 100644
--- a/make/custom/leon2.cfg
+++ b/make/custom/leon2.cfg
@@ -36,20 +36,6 @@ CFLAGS_OPTIMIZE_V=-O4
# NO_TABLE_MOVE (SPARC PORT)
# do not have a second trap table -- use the BSP's
#
-# CONSOLE_USE_POLLED (leon_bsp)
-# CONSOLE_USE_INTERRUPTS (leon_bsp)
-# The erc32 console driver can operate in either polled or interrupt mode.
-# Under the simulator (especially when FAST_UART is defined), polled seems
-# to operate better. It is common for a task to print a line (like the
-# end of test message) and then exit. In this case, the program returns
-# control to the simulator command line before the program has even queued
-# the output to the uart. Thus sis has no chance of getting the data out.
-#
-# SIMSPARC_FAST_IDLE (leon_bsp)
-# If defined, speed up the clock ticks while the idle task is running so
-# time spent in the idle task is minimized. This significantly reduces
-# the wall time required to execute the RTEMS test suites.
-#
# CPU_U32_FIX (all)
# Needed to align received TCP/IP packets since SPARC does not
# support unaligned memory access.
@@ -57,9 +43,6 @@ CFLAGS_OPTIMIZE_V=-O4
define make-target-options
@echo "#define NO_TABLE_MOVE 1" >>$@
- @echo "#define CONSOLE_USE_INTERRUPTS 0" >>$@
- @echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@
- @echo "/* #define SIMSPARC_FAST_IDLE 1 */" >>$@
@echo "#define CPU_U32_FIX 1" >>$@
endef
diff --git a/make/custom/mvme162.cfg b/make/custom/mvme162.cfg
index b02a511ff5..51eba3a25a 100644
--- a/make/custom/mvme162.cfg
+++ b/make/custom/mvme162.cfg
@@ -8,19 +8,9 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU=m68k
-ifeq ($(RTEMS_MVME162_MODEL),mvme162lx)
-
-RTEMS_CPU_MODEL=m68lc040
-
-else
-ifeq ($(RTEMS_MVME162_MODEL),)
-
RTEMS_MVME162_MODEL=mvme162
RTEMS_CPU_MODEL=m68040
-endif # mvme162 - mc68040
-endif # mvme162lx - mc68lc040
-
# This is the actual bsp directory used during the build process.
RTEMS_BSP_FAMILY=mvme162
@@ -28,48 +18,16 @@ RTEMS_BSP_FAMILY=mvme162
# and (hopefully) optimize for it.
#
-ifeq ($(RTEMS_CPU_MODEL),m68040)
CPU_CFLAGS = -m68040
-else
-ifeq ($(RTEMS_CPU_MODEL),m68lc040)
-CPU_CFLAGS = -m68040 -msoft-float
-endif # mc68040
-endif # mc68lc040
# optimize flag: typically -0, could use -O4 or -fast
# -O4 is ok for RTEMS
CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
-# This section makes the target dependent options file.
-
-define make-target-options
- @echo "#undef $(RTEMS_MVME162_MODEL)" >>$@
- @echo "#define $(RTEMS_MVME162_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.
-ifeq ($(RTEMS_USE_GCC272),yes)
-
-ifeq ($(RTEMS_CPU_MODEL),m68lc040)
-# override default location of Standard C Library
-# LIBC_LIBC=$(RTEMS_LIBC_DIR)/lib/msoft-float/libc.a
-# LIBC_LIBM=$(RTEMS_LIBC_DIR)/lib/msoft-float/libm.a
-endif # mc68lc040
-
-define make-exe
- $(LD) $(LDFLAGS) -N -T $(LINKCMDS) -o $(basename $@).nxe \
- $(START_FILE) $(LINK_OBJS) \
- --start-group $(LINK_LIBS) --end-group
- $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
- sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
- $(PACKHEX) > $(basename $@).exe
- $(NM) -g -n $(basename $@).nxe > $(basename $@).num
- $(SIZE) $(basename $@).nxe
-endef
-else
define make-exe
$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
-o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
@@ -80,7 +38,6 @@ define make-exe
$(NM) -g -n $(basename $@).nxe > $(basename $@).num
$(SIZE) $(basename $@).nxe
endef
-endif
# Miscellaneous additions go here
diff --git a/make/custom/mvme162lx.cfg b/make/custom/mvme162lx.cfg
index 881df8202c..476e83b001 100644
--- a/make/custom/mvme162lx.cfg
+++ b/make/custom/mvme162lx.cfg
@@ -13,5 +13,39 @@
RTEMS_MVME162_MODEL=mvme162lx
-include $(RTEMS_ROOT)/make/custom/mvme162.cfg
+include $(RTEMS_ROOT)/make/custom/default.cfg
+RTEMS_CPU=m68k
+RTEMS_CPU_MODEL=m68lc040
+
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=mvme162
+
+# This contains the compiler options necessary to select the CPU model
+# and (hopefully) optimize for it.
+#
+CPU_CFLAGS = -m68040 -msoft-float
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
+
+# 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.
+
+define make-exe
+ $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
+ -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
+ #$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
+ #sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
+ # $(PACKHEX) > $(basename $@).exe
+ $(OBJCOPY) -O binary $(basename $@).nxe $(basename $@).exe
+ $(NM) -g -n $(basename $@).nxe > $(basename $@).num
+ $(SIZE) $(basename $@).nxe
+endef
+
+# Miscellaneous additions go here
+
+# BSP-specific tools
+SLOAD=$(PROJECT_TOOLS)/sload
diff --git a/make/custom/mvme167.cfg b/make/custom/mvme167.cfg
index a5fa226015..f82dee1bd6 100644
--- a/make/custom/mvme167.cfg
+++ b/make/custom/mvme167.cfg
@@ -26,12 +26,6 @@ CPU_CFLAGS = -m68040
# BSP specific preprocessor flags.
# These should only be used in BSP dependent directories.
#
-# CD2401_INT_LEVEL
-# Interrupt level for the CD2401(when CD2401_IO_MODE == 1).
-#
-# CD2401_IO_MODE
-# 0 for polled I/O, 1 for interrupt-driven.
-#
# CONSOLE_MINOR
# Port to use for the RTEMS console
# 0 - /dev/tty0, Serial Port 1/Console on the MVME712M.
@@ -46,7 +40,7 @@ CPU_CFLAGS = -m68040
# 2 - /dev/tty2, Serial Port 3 on the MVME712M.
# 3 - /dev/tty3, Serial Port 4 on the MVME712M.
-BSP_CPPFLAGS += -DCD2401_INT_LEVEL=1 -DCD2401_IO_MODE=0 -DCD2401_USE_TERMIOS=0 -DCONSOLE_MINOR=1 -DPRINTK_MINOR=1
+BSP_CPPFLAGS += -DCONSOLE_MINOR=1 -DPRINTK_MINOR=1
CFLAGS_DEBUG_V += -ggdb