bsp/pc386: Move libcpu content to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

7 files changed, 4 insertions, 45 deletions

diff --git a/c/src/lib/libcpu/i386/cpuModel.S b/bsps/i386/pc386/start/cpuModel.S
index b2e4ddce9e..b2e4ddce9e 100644
--- a/c/src/lib/libcpu/i386/cpuModel.S
+++ b/bsps/i386/pc386/start/cpuModel.S
diff --git a/c/src/lib/libcpu/i386/displayCpu.c b/bsps/i386/pc386/start/displayCpu.c
index f451194d96..f451194d96 100644
--- a/c/src/lib/libcpu/i386/displayCpu.c
+++ b/bsps/i386/pc386/start/displayCpu.c
diff --git a/c/src/lib/libcpu/i386/idtr.S b/bsps/i386/pc386/start/idtr.S
index 48ce1df8c4..48ce1df8c4 100644
--- a/c/src/lib/libcpu/i386/idtr.S
+++ b/bsps/i386/pc386/start/idtr.S
diff --git a/c/src/lib/libcpu/i386/page.c b/bsps/i386/pc386/start/page.c
index f05e145f51..f05e145f51 100644
--- a/c/src/lib/libcpu/i386/page.c
+++ b/bsps/i386/pc386/start/page.c
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index a8b469120b..869f761a62 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -171,6 +171,10 @@ libbsp_a_SOURCES += wd8003/wd8003.c
 endif
 
 libbsp_a_SOURCES += ../../../../../../bsps/i386/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/cpuModel.S
+libbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/displayCpu.c
+libbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/idtr.S
+libbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/page.c
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/page.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/score.rel
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
deleted file mode 100644
index ec7a4c4a48..0000000000
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
-noinst_PROGRAMS =
-
-include $(top_srcdir)/../../../automake/compile.am
-
-noinst_PROGRAMS += score.rel
-score_rel_SOURCES = displayCpu.c cpuModel.S cpuModel.h idtr.S cpu.h
-score_rel_CPPFLAGS = $(AM_CPPFLAGS)
-score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += page.rel
-page_rel_SOURCES = page.c page.h
-page_rel_CPPFLAGS = $(AM_CPPFLAGS)
-page_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/i386/configure.ac b/c/src/lib/libcpu/i386/configure.ac
deleted file mode 100644
index 3f0f59543a..0000000000
--- a/c/src/lib/libcpu/i386/configure.ac
+++ /dev/null
@@ -1,28 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([rtems-c-src-lib-libcpu-i386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
-AC_CONFIG_SRCDIR([idtr.S])
-RTEMS_TOP([../../../../..],[../../..])
-RTEMS_SOURCE_TOP
-RTEMS_BUILD_TOP
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSBSP
-
-RTEMS_PROJECT_ROOT
-
-RTEMS_PROG_CC_FOR_TARGET
-AM_PROG_CC_C_O
-RTEMS_CANONICALIZE_TOOLS
-RTEMS_PROG_CCAS
-
-RTEMS_AMPOLISH3
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT