2002-04-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Remove BSPOPTS_*(NO_TABLE_MOVE).
	Remove BSPOPTS_*(FPU_REVB).
	* wrapup/Makefile.am: Remove tbr.

6 files changed, 14 insertions, 18 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog
index e5c846d168..1f07b58d1a 100644
--- a/c/src/lib/libbsp/sparc/erc32/ChangeLog
+++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove BSPOPTS_*(NO_TABLE_MOVE).
+	Remove BSPOPTS_*(FPU_REVB).
+	* wrapup/Makefile.am: Remove tbr.
+
 2002-03-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Add BSPOPTS_*(NO_TABLE_MOVE).
diff --git a/c/src/lib/libbsp/sparc/erc32/configure.ac b/c/src/lib/libbsp/sparc/erc32/configure.ac
index ce1ff75f40..bfe3e65bdb 100644
--- a/c/src/lib/libbsp/sparc/erc32/configure.ac
+++ b/c/src/lib/libbsp/sparc/erc32/configure.ac
@@ -37,14 +37,6 @@ RTEMS_BSPOPTS_HELP([SIMSPARC_FAST_IDLE],
  time spent in the idle task is minimized.  This significantly reduces
  the wall time required to execute the RTEMS test suites.])
 
-RTEMS_BSPOPTS_SET([NO_TABLE_MOVE],[*],[1])
-RTEMS_BSPOPTS_HELP([NO_TABLE_MOVE],
-[do not have a second trap table -- use the BSP's.])
-
-RTEMS_BSPOPTS_SET([FPU_REVB],[*],[])
-RTEMS_BSPOPTS_HELP([FPU_REVB],
-[If defined, enables work-around for bug 3.14 in FPU rev.B or rev.C])
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 clock/Makefile
diff --git a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am
index 071a53d9b6..3e088eff5e 100644
--- a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am
@@ -10,7 +10,7 @@ endif
 
 BSP_PIECES = startup console clock timer gnatsupp $(NETWORKING_DRIVER)
 # pieces to pick up out of libcpu/sparc
-CPU_PIECES = cache reg_win syscall tbr
+CPU_PIECES = cache reg_win syscall
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog
index dccd33af0b..c00f692104 100644
--- a/c/src/lib/libbsp/sparc/leon/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove BSPOPTS_*(NO_TABLE_MOVE).
+	Remove BSPOPTS_*(FPU_REVB).
+	* wrapup/Makefile.am: Remove tbr.
+
 2002-03-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Add BSPOPTS_*(NO_TABLE_MOVE).
diff --git a/c/src/lib/libbsp/sparc/leon/configure.ac b/c/src/lib/libbsp/sparc/leon/configure.ac
index ca15d42054..35db9c0929 100644
--- a/c/src/lib/libbsp/sparc/leon/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon/configure.ac
@@ -33,14 +33,6 @@ RTEMS_BSPOPTS_HELP([SIMSPARC_FAST_IDLE],
  time spent in the idle task is minimized.  This significantly reduces
  the wall time required to execute the RTEMS test suites.])
 
-RTEMS_BSPOPTS_SET([NO_TABLE_MOVE],[*],[1])
-RTEMS_BSPOPTS_HELP([NO_TABLE_MOVE],
-[do not have a second trap table -- use the BSP's.])
-
-RTEMS_BSPOPTS_SET([FPU_REVB],[*],[])
-RTEMS_BSPOPTS_HELP([FPU_REVB],
-[If defined, enables work-around for bug 3.14 in FPU rev.B or rev.C])
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 clock/Makefile
diff --git a/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am
index 1b60cf5c85..82a5939ada 100644
--- a/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am
@@ -5,7 +5,7 @@
 
 BSP_PIECES = startup console clock timer gnatsupp $(NETWORK)
 # pieces to pick up out of libcpu/sparc
-CPU_PIECES = cache reg_win syscall tbr
+CPU_PIECES = cache reg_win syscall
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \