diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/ChangeLog | 6 | ||||
| -rw-r--r-- | make/custom/Makefile.am | 7 | ||||
| -rw-r--r-- | make/custom/erc32.cfg | 17 | ||||
| -rw-r--r-- | make/custom/erc32nfp.cfg | 13 | ||||
| -rw-r--r-- | make/custom/leon1.cfg | 12 | ||||
| -rw-r--r-- | make/custom/leon2.cfg | 101 |
6 files changed, 149 insertions, 7 deletions
diff --git a/make/ChangeLog b/make/ChangeLog index d01294a4bf..b8075fd315 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,4 +1,10 @@ +2000-11-13 Jiri Gaisler <jgais@ws.estec.esa.nl> + + * custom/Makefile.am: Modified to reflect addition of files. + * custom/erc32.cfg: Modified to support addition of no-FP ERC32 variant. + * custom/erc32nfp.cfg, custom/leon1.cfg, custom/leon2.cfg: New file. + 2000-11-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * custom/Cygwin-posix.cfg: Add -U__STRICT_ANSI__ to LIBC_DEFINES. diff --git a/make/custom/Makefile.am b/make/custom/Makefile.am index 751e53873d..5cde7e0720 100644 --- a/make/custom/Makefile.am +++ b/make/custom/Makefile.am @@ -11,9 +11,10 @@ rtems_make_custom_DATA = default.cfg EXTRA_DIST = Cygwin-posix.cfg FreeBSD-posix.cfg HPUX9-posix.cfg \ Linux-posix.cfg Solaris-posix.cfg bare.cfg cvme961.cfg dmv152.cfg \ - dmv177.cfg efi332.cfg efi68k.cfg erc32.cfg eth_comm.cfg gen68302.cfg \ - gen68340.cfg gen68360.cfg gen68360_040.cfg gensh1.cfg helas403.cfg \ - i386ex.cfg idp.cfg mcp750.cfg mvme136.cfg mvme147.cfg mvme147s.cfg \ + dmv177.cfg efi332.cfg efi68k.cfg erc32.cfg erc32nfp.cfg eth_comm.cfg \ + gen68302.cfg gen68340.cfg gen68360.cfg gen68360_040.cfg gensh1.cfg \ + helas403.cfg i386ex.cfg idp.cfg leon1.cfg leon2.cfg mcp750.cfg \ + mvme136.cfg mvme147.cfg mvme147s.cfg \ mvme162.cfg mvme162lx.cfg mvme167.cfg mvme2307.cfg no_bsp.cfg \ ods68302.cfg p4000.cfg p4600.cfg p4650.cfg papyrus.cfg pc386.cfg \ portsw.cfg posix.cfg ppcn_60x.cfg psim.cfg score603e.cfg simhppa.cfg \ diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg index b5621caf54..598b82fb2a 100644 --- a/make/custom/erc32.cfg +++ b/make/custom/erc32.cfg @@ -8,8 +8,12 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=sparc -RTEMS_CPU_MODEL=erc32 +ifeq ($(RTEMS_CPU_MODEL),erc32nfp) +MSOFT_FLOAT = -msoft-float +else +RTEMS_CPU_MODEL=erc32 +endif # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=erc32 @@ -19,10 +23,10 @@ RTEMS_BSP_FAMILY=erc32 ifeq ($(RTEMS_USE_GCC272),yes) # -mno-v8 says not to use v8 level instructions. i.e. use v7 only # FIXME: This known not to work with gcc's >= gcc-2.95 -CPU_CFLAGS = -mno-v8 -mcypress +CPU_CFLAGS = -mno-v8 -mcypress $(MSOFT_FLOAT) else # -mcpu=cypress says to optimize for a Cypress 60x chipset -CPU_CFLAGS = -mcpu=cypress +CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT) endif # optimize flag: typically -0, could use -O4 or -fast @@ -51,13 +55,18 @@ CFLAGS_OPTIMIZE_V=-O4 # FPU_REVB (erc32_bsp) # If defined, enables work-around for bug 3.14 in FPU rev.B or rev.C # +# CPU_U32_FIX (all) +# 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 CONSOLE_USE_INTERRUPTS 0" >>$@ @echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@ @echo "/* #define SIMSPARC_FAST_IDLE 1 */" >>$@ - @echo "#define FPU_REVB 1" >>$@ + @echo "/* #define FPU_REVB 1 */" >>$@ + @echo "#define CPU_U32_FIX 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/erc32nfp.cfg b/make/custom/erc32nfp.cfg new file mode 100644 index 0000000000..762f301b91 --- /dev/null +++ b/make/custom/erc32nfp.cfg @@ -0,0 +1,13 @@ +# +# Config file for the European Space Agency ERC32 +# a V7 SPARC processor derived from the Cypress 601/602 set. +# +# $Id$ +# + +# ERC32 without FPU + +RTEMS_CPU_MODEL=erc32nfp + +include $(RTEMS_ROOT)/make/custom/erc32.cfg + diff --git a/make/custom/leon1.cfg b/make/custom/leon1.cfg new file mode 100644 index 0000000000..39614e3b3f --- /dev/null +++ b/make/custom/leon1.cfg @@ -0,0 +1,12 @@ +# +# Config file for the European Space Agency LEON SPARC processor. +# +# $Id$ +# + +# LEON without FPU + +RTEMS_CPU_MODEL=leon1 + +include $(RTEMS_ROOT)/make/custom/leon2.cfg + diff --git a/make/custom/leon2.cfg b/make/custom/leon2.cfg new file mode 100644 index 0000000000..1d1dcca041 --- /dev/null +++ b/make/custom/leon2.cfg @@ -0,0 +1,101 @@ +# +# Config file for the European Space Agency ERC32 SPARC processor. +# +# $Id$ +# + +include $(RTEMS_ROOT)/make/custom/default.cfg + +RTEMS_CPU=sparc + +ifeq ($(RTEMS_CPU_MODEL),leon1) +MSOFT_FLOAT = -msoft-float +else +RTEMS_CPU_MODEL=leon2 +endif +# This is the actual bsp directory used during the build process. +RTEMS_BSP_FAMILY=leon + +# The -mflat avoids the use of save/restore instructions. It has +# a negative impact on the performance of RTEMS and should not be used. + +ifeq ($(RTEMS_USE_GCC272),yes) +# -mno-v8 says not to use v8 level instructions. i.e. use v7 only +CPU_CFLAGS = -mno-v8 -mcypress $(MSOFT_FLOAT) +else +# -mcpu=cypress says to optimize for a Cypress 60x chipset +CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT) +endif + +# optimize flag: typically -0, could use -O4 or -fast +# -O4 is ok for RTEMS +CFLAGS_OPTIMIZE_V=-O4 + +# This makes the target dependent options file + +# NDEBUG (C library) +# if defined asserts do not generate code. This is commonly used +# as a command line option. +# +# RTEMS_TEST_NO_PAUSE (RTEMS tests) +# do not pause between screens of output in the rtems tests +# +# NO_TABLE_MOVE (SPARC PORT) +# do not have a second trap table -- use the BSP's +# +# RTEMS_DEBUG (RTEMS) +# If defined, debug checks in RTEMS and support library code are enabled. +# +# 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. +# + +define make-target-options + @echo "/* #define NDEBUG 1 */ " >>$@ + @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ + @echo "/* #define RTEMS_DEBUG 1 */" >>$@ + @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 + + + +# 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) +define make-exe + $(LD) -u _sbrk $(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) -o $(basename $@).exe \ + $(LINK_OBJS) $(LINK_LIBS) + $(NM) -g -n $(basename $@).exe > $(basename $@).num + $(SIZE) $(basename $@).exe +endef +endif +# Miscellaneous additions go here + |