7 files changed, 2 insertions, 72 deletions
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index 0cde12eaa6..3854e3b36f 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -44,7 +44,7 @@ startup_SOURCES = startup/bspclean.c startup/m5op_sparc.S \
     ../../shared/bsppost.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/bspgetworkarea.c \
-    ../shared/startup/bspstart.c \
+    ../../shared/bspstart.c \
     ../shared/startup/setvec.c \
     ../../shared/gnatinstallhandler.c  \
     ../shared/helenos/boot/genarch/balloc.c \
@@ -73,7 +73,6 @@ libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
 libbsp_a_LIBADD = \
       ../../../libcpu/@RTEMS_CPU@/shared/shared-score.rel \
       ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
-      ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \
       ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel 
 
 include $(srcdir)/preinstall.am
diff --git a/c/src/lib/libbsp/sparc64/shared/startup/bsppredriverhook.c b/c/src/lib/libbsp/sparc64/shared/startup/bsppredriverhook.c
deleted file mode 100644
index fd3927ad3a..0000000000
--- a/c/src/lib/libbsp/sparc64/shared/startup/bsppredriverhook.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  This is a bsp_predriver_hook routine for sparc64
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <bsp/bootcard.h>
-
-extern void sparc64_install_isr_entries(void);
-
-void bsp_predriver_hook( void )
-{
-  sparc64_install_isr_entries();
-}
diff --git a/c/src/lib/libbsp/sparc64/shared/startup/bspstart.c b/c/src/lib/libbsp/sparc64/shared/startup/bspstart.c
deleted file mode 100644
index f6c190b67a..0000000000
--- a/c/src/lib/libbsp/sparc64/shared/startup/bspstart.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  This routine does the bulk of the system initialization.
- */
-
-/*
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-
-extern void sparc64_install_isr_entries(void);
-
-void bsp_start( void )
-{
-  sparc64_install_isr_entries();
-}
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 10c0b35e29..85f496aaa9 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -89,7 +89,7 @@ startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/bspgetworkarea.c \
-    ../shared/startup/bsppredriverhook.c \
+    ../../shared/bsppredriverhook.c \
     ../shared/startup/setvec.c \
     ../../shared/gnatinstallhandler.c  \
     ../shared/helenos/boot/genarch/balloc.c \
@@ -124,7 +124,6 @@ libbsp_a_SOURCES = $(startup_SOURCES) $(mmu_SOURCES) $(clock_SOURCES) $(console_
 libbsp_a_LIBADD = \
       ../../../libcpu/@RTEMS_CPU@/shared/shared-score.rel \
       ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
-      ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \
       ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel 
 
 include $(srcdir)/preinstall.am
diff --git a/c/src/lib/libcpu/sparc64/Makefile.am b/c/src/lib/libcpu/sparc64/Makefile.am
index 3b05ae8a35..a95672e8d8 100644
--- a/c/src/lib/libcpu/sparc64/Makefile.am
+++ b/c/src/lib/libcpu/sparc64/Makefile.am
@@ -25,11 +25,6 @@ shared_sparc64_syscall_rel_SOURCES = shared/syscall/sparc64-syscall.S \
 shared_sparc64_syscall_rel_CPPFLAGS = $(AM_CPPFLAGS)
 shared_sparc64_syscall_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-noinst_PROGRAMS += shared/interrupts.rel
-shared_interrupts_rel_SOURCES = shared/interrupts/installisrentries.c
-shared_interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/interrupts
-shared_interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
 noinst_PROGRAMS += shared/cache.rel
 shared_cache_rel_SOURCES = shared/cache/cache.c shared/cache/cache_.h \
     ../shared/src/cache_aligned_malloc.c ../shared/src/cache_manager.c
diff --git a/c/src/lib/libcpu/sparc64/shared/interrupts/installisrentries.c b/c/src/lib/libcpu/sparc64/shared/interrupts/installisrentries.c
deleted file mode 100644
index 593bfd00fa..0000000000
--- a/c/src/lib/libcpu/sparc64/shared/interrupts/installisrentries.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Install trap handlers for handling software interrupts.
- *  This file is deprecated, as the trap handlers are needed before this 
- *  function is called. We still use this as for debugging purposes.
- *
- *  Copyright 2010 Gedare Bloom.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <rtems.h>
-#include <rtems/asm.h>
-#include <rtems/score/sparc64.h>
-#include <rtems/bspIo.h>
-
-void sparc64_install_isr_entries( void )
-{
-  return;
-}
diff --git a/c/src/lib/libcpu/sparc64/shared/score/cpu.c b/c/src/lib/libcpu/sparc64/shared/score/cpu.c
index 8fa5898360..a7b1f87a8b 100644
--- a/c/src/lib/libcpu/sparc64/shared/score/cpu.c
+++ b/c/src/lib/libcpu/sparc64/shared/score/cpu.c
@@ -100,7 +100,6 @@ uint32_t   _CPU_ISR_Get_level( void )
  *  a synchronous trap.  This will avoid the executive changing the return
  *  address.
  */
-/*  Verified this is working properly from sparc64_install_isr_entries */
 void _CPU_ISR_install_raw_handler(
   uint32_t    vector,
   proc_ptr    new_handler,