bsps: Remove libcpu

This patch is a part of the BSP source reorganization.

Update #3285.

5 files changed, 1 insertions, 41 deletions

diff --git a/c/src/configure.ac b/c/src/configure.ac
index 71b6a61d88..ff7c7752ed 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -128,19 +128,11 @@ RTEMS_BSP_CONFIG_SUBDIR(
 AC_CONFIG_SUBDIRS([make])
 BSP_SUBDIRS="$BSP_SUBDIRS make"
 
-RTEMS_CPU_SUBDIRS(lib/libcpu)
-if test -f "${srcdir}/lib/libcpu/${RTEMS_CPU}/configure.ac"; then
-  libcpu_cpu_subdir="${RTEMS_CPU}"
-else
-  libcpu_cpu_subdir=
-fi
-AC_SUBST(libcpu_cpu_subdir)
-
 # Is there code where there should be for this BSP?
 RTEMS_CPU_SUBDIRS([lib/libbsp])
 AC_SUBST(libbsp_cpu_subdir,$RTEMS_CPU)
 
-BSP_SUBDIRS="$BSP_SUBDIRS lib"
+BSP_SUBDIRS="$BSP_SUBDIRS lib/libbsp"
 BSP_SUBDIRS="$BSP_SUBDIRS libchip"
 BSP_SUBDIRS="$BSP_SUBDIRS support"
 BSP_SUBDIRS="$BSP_SUBDIRS wrapup"
@@ -178,8 +170,6 @@ AC_CONFIG_FILES([Makefile],
 AC_CONFIG_FILES([
 support/Makefile
 libchip/Makefile
-lib/Makefile
-lib/libcpu/Makefile
 lib/libbsp/Makefile
 wrapup/Makefile
 ])
diff --git a/c/src/lib/Makefile.am b/c/src/lib/Makefile.am
deleted file mode 100644
index ff39067ae9..0000000000
--- a/c/src/lib/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-_SUBDIRS = libcpu libbsp
-
-include $(top_srcdir)/automake/subdirs.am
-include $(top_srcdir)/automake/local.am
-
-#
-# The libsp cannot be built until libcpu is built.
-#
-libbsp: libcpu
diff --git a/c/src/lib/libcpu/Makefile.am b/c/src/lib/libcpu/Makefile.am
deleted file mode 100644
index 693f50b2b8..0000000000
--- a/c/src/lib/libcpu/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRA_DIST =
-
-_SUBDIRS = @libcpu_cpu_subdir@
-DIST_SUBDIRS = @libcpu_cpu_subdir@
-
-include $(top_srcdir)/automake/subdirs.am
-include $(top_srcdir)/automake/local.am
diff --git a/c/src/lib/libcpu/README b/c/src/lib/libcpu/README
deleted file mode 100644
index 42aaf0e33d..0000000000
--- a/c/src/lib/libcpu/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the README file for libcpu.
-
-This directory contains reusable libraries which are CPU dependent but not
-target board dependent.  For example, the PowerPC has an on CPU decrementer
-register which may be used by all PowerPC BSP's for the Clock and Timer
-Drivers.
-
-Other examples include the caching support for the m68k CPU models and
-MIPS CPU model exception vectoring routines.  This level of support
-will make it easier for others developing embedded applications on a given
-CPU.
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 43f6ad85f7..a52b90df6f 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -17,9 +17,6 @@ SRCS = ../support/libsupport.a
 
 SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a
 
-# FIXME: ATM, there is no libcpu.a, anymore.
-# SRCS += $(wildcard $(PROJECT_LIB)/libcpu.a)
-
 SRCS += ../libchip/libflash.a
 SRCS += ../libchip/librtcio.a
 SRCS += ../libchip/libserialio.a