[rtems commit] bsp/bfin: Move libcpu content to bsps
Sebastian Huber
sebh at rtems.org
Mon Mar 26 09:10:12 UTC 2018
Module: rtems
Branch: master
Commit: e2bd1f653a3bbf969962082b9ccf1e73b0879819
Changeset: http://git.rtems.org/rtems/commit/?id=e2bd1f653a3bbf969962082b9ccf1e73b0879819
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Wed Mar 21 16:38:43 2018 +0100
bsp/bfin: Move libcpu content to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
---
.../bfin/TLL6527M/start}/interrupt.c | 0
.../bfin/bf537Stamp/net}/ethernet.c | 0
.../bfin/clock => bsps/bfin/shared/dev}/clock.c | 0
.../bfin/clock => bsps/bfin/shared/dev}/rtc.c | 0
.../bfin/serial => bsps/bfin/shared/dev}/spi.c | 0
.../bfin/serial => bsps/bfin/shared/dev}/sport.c | 0
.../bfin/timer => bsps/bfin/shared/dev}/timer.c | 0
.../bfin/serial => bsps/bfin/shared/dev}/twi.c | 0
.../bfin/serial => bsps/bfin/shared/dev}/uart.c | 0
.../interrupt => bsps/bfin/shared}/interrupt.c | 0
.../lib/libcpu/bfin/mmu => bsps/bfin/shared}/mmu.c | 0
bsps/bfin/shared/shared.am | 8 +++
c/src/lib/libbsp/bfin/TLL6527M/Makefile.am | 9 +--
.../libbsp/bfin/TLL6527M/make/custom/TLL6527M.cfg | 1 -
c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am | 14 +---
.../bfin/bf537Stamp/make/custom/bf537Stamp.cfg | 1 -
c/src/lib/libbsp/bfin/eZKit533/Makefile.am | 9 +--
.../libbsp/bfin/eZKit533/make/custom/eZKit533.cfg | 1 -
c/src/lib/libcpu/bfin/Makefile.am | 83 ----------------------
c/src/lib/libcpu/bfin/README | 11 ---
c/src/lib/libcpu/bfin/configure.ac | 35 ---------
21 files changed, 15 insertions(+), 157 deletions(-)
diff --git a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.c b/bsps/bfin/TLL6527M/start/interrupt.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.c
rename to bsps/bfin/TLL6527M/start/interrupt.c
diff --git a/c/src/lib/libcpu/bfin/network/ethernet.c b/bsps/bfin/bf537Stamp/net/ethernet.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/network/ethernet.c
rename to bsps/bfin/bf537Stamp/net/ethernet.c
diff --git a/c/src/lib/libcpu/bfin/clock/clock.c b/bsps/bfin/shared/dev/clock.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/clock/clock.c
rename to bsps/bfin/shared/dev/clock.c
diff --git a/c/src/lib/libcpu/bfin/clock/rtc.c b/bsps/bfin/shared/dev/rtc.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/clock/rtc.c
rename to bsps/bfin/shared/dev/rtc.c
diff --git a/c/src/lib/libcpu/bfin/serial/spi.c b/bsps/bfin/shared/dev/spi.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/serial/spi.c
rename to bsps/bfin/shared/dev/spi.c
diff --git a/c/src/lib/libcpu/bfin/serial/sport.c b/bsps/bfin/shared/dev/sport.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/serial/sport.c
rename to bsps/bfin/shared/dev/sport.c
diff --git a/c/src/lib/libcpu/bfin/timer/timer.c b/bsps/bfin/shared/dev/timer.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/timer/timer.c
rename to bsps/bfin/shared/dev/timer.c
diff --git a/c/src/lib/libcpu/bfin/serial/twi.c b/bsps/bfin/shared/dev/twi.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/serial/twi.c
rename to bsps/bfin/shared/dev/twi.c
diff --git a/c/src/lib/libcpu/bfin/serial/uart.c b/bsps/bfin/shared/dev/uart.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/serial/uart.c
rename to bsps/bfin/shared/dev/uart.c
diff --git a/c/src/lib/libcpu/bfin/interrupt/interrupt.c b/bsps/bfin/shared/interrupt.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/interrupt/interrupt.c
rename to bsps/bfin/shared/interrupt.c
diff --git a/c/src/lib/libcpu/bfin/mmu/mmu.c b/bsps/bfin/shared/mmu.c
similarity index 100%
rename from c/src/lib/libcpu/bfin/mmu/mmu.c
rename to bsps/bfin/shared/mmu.c
diff --git a/bsps/bfin/shared/shared.am b/bsps/bfin/shared/shared.am
new file mode 100644
index 0000000..93009c3
--- /dev/null
+++ b/bsps/bfin/shared/shared.am
@@ -0,0 +1,8 @@
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/mmu.c
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/dev/clock.c
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/dev/rtc.c
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/dev/spi.c
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/dev/sport.c
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/dev/timer.c
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/dev/twi.c
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/dev/uart.c
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index aff2e31..f459b25 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
@@ -30,15 +30,10 @@ libbsp_a_SOURCES += ../../shared/bspreset.c
libbsp_a_SOURCES += console/console.c
libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
-
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mmu.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/interrupt.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/uart.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/clock.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rtc.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/TLL6527M/start/interrupt.c
EXTRA_DIST += times
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/bfin/shared/shared.am
include $(srcdir)/../../../../../../bsps/bfin/TLL6527M/headers.am
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/make/custom/TLL6527M.cfg b/c/src/lib/libbsp/bfin/TLL6527M/make/custom/TLL6527M.cfg
index 56aaecb..8226543 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/make/custom/TLL6527M.cfg
+++ b/c/src/lib/libbsp/bfin/TLL6527M/make/custom/TLL6527M.cfg
@@ -5,7 +5,6 @@
include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU=bfin
-RTEMS_CPU_MODEL=bf52x
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index ddd3207..d8a7a30 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -31,21 +31,13 @@ libbsp_a_SOURCES += ../../shared/bspreset.c
libbsp_a_SOURCES += console/console.c
libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/interrupt.c
if HAS_NETWORKING
libbsp_a_SOURCES += network/networkconfig.c
-endif
-
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mmu.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/interrupt.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/uart.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/clock.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rtc.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
-
-if HAS_NETWORKING
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/bf537Stamp/net/ethernet.c
endif
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/bfin/shared/shared.am
include $(srcdir)/../../../../../../bsps/bfin/bf537Stamp/headers.am
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/make/custom/bf537Stamp.cfg b/c/src/lib/libbsp/bfin/bf537Stamp/make/custom/bf537Stamp.cfg
index d533ca4..e27a7d3 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/make/custom/bf537Stamp.cfg
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/make/custom/bf537Stamp.cfg
@@ -5,7 +5,6 @@
include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU=bfin
-RTEMS_CPU_MODEL=bf537
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index 57e698a..6257b96 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -31,15 +31,10 @@ libbsp_a_SOURCES += ../../shared/bspreset.c
libbsp_a_SOURCES += console/console-io.c
libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
-
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mmu.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/interrupt.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/uart.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/clock.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rtc.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
+libbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/interrupt.c
EXTRA_DIST += times
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/bfin/shared/shared.am
include $(srcdir)/../../../../../../bsps/bfin/eZKit533/headers.am
diff --git a/c/src/lib/libbsp/bfin/eZKit533/make/custom/eZKit533.cfg b/c/src/lib/libbsp/bfin/eZKit533/make/custom/eZKit533.cfg
index ada3c32..834039d 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/make/custom/eZKit533.cfg
+++ b/c/src/lib/libbsp/bfin/eZKit533/make/custom/eZKit533.cfg
@@ -5,7 +5,6 @@
include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU=bfin
-RTEMS_CPU_MODEL=bf533
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
diff --git a/c/src/lib/libcpu/bfin/Makefile.am b/c/src/lib/libcpu/bfin/Makefile.am
deleted file mode 100644
index 8d48448..0000000
--- a/c/src/lib/libcpu/bfin/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
-include $(top_srcdir)/../../../automake/compile.am
-
-EXTRA_DIST =
-
-noinst_PROGRAMS =
-
-
-############
-# Start of bf52x files
-if bf52x
-
-## INTERRUPT
-noinst_PROGRAMS += bf52x/interrupt.rel
-bf52x_interrupt_rel_SOURCES = bf52x/interrupt/interrupt.c \
- bf52x/interrupt/interrupt.h
-bf52x_interrupt_rel_CPPFLAGS = $(AM_CPPFLAGS)
-bf52x_interrupt_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-endif
-# endof bf52x
-############
-
-noinst_PROGRAMS += mmu.rel
-mmu_rel_SOURCES = mmu/mmu.c
-mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-if bf52x
-
-else
-noinst_PROGRAMS += interrupt.rel
-interrupt_rel_SOURCES = interrupt/interrupt.c
-interrupt_rel_CPPFLAGS = $(AM_CPPFLAGS)
-interrupt_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-endif
-
-noinst_PROGRAMS += clock.rel
-clock_rel_SOURCES = clock/clock.c
-clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += rtc.rel
-rtc_rel_SOURCES = clock/rtc.c clock/rtc.h
-rtc_rel_CPPFLAGS = $(AM_CPPFLAGS)
-rtc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += uart.rel
-uart_rel_SOURCES = serial/uart.c
-uart_rel_CPPFLAGS = $(AM_CPPFLAGS)
-uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += sport.rel
-sport_rel_SOURCES = serial/sport.c
-sport_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += spi.rel
-spi_rel_SOURCES = serial/spi.c
-spi_rel_CPPFLAGS = $(AM_CPPFLAGS)
-spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += twi.rel
-twi_rel_SOURCES = serial/twi.c
-twi_rel_CPPFLAGS = $(AM_CPPFLAGS)
-twi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += timer.rel
-timer_rel_SOURCES = timer/timer.c
-timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-if HAS_NETWORKING
-## network
-noinst_PROGRAMS += network.rel
-network_rel_SOURCES = network/ethernet.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS)
-network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/bfin/README b/c/src/lib/libcpu/bfin/README
deleted file mode 100644
index da0d642..0000000
--- a/c/src/lib/libcpu/bfin/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This hierarchy contains support routines for the Analog Devices
-Blackfin family of processors.
-
-It is assumed that bsp.h includes <libcpu/bfxxx.h>, where xxx is
-the processor type. This is how the libcpu modules determine which
-processor variant they're being built for.
-
-serial/sport* is currently just a placeholders. serial/twi* does not
-contain enough code to do anything useful; it is however a start at an
-I2C driver.
-
diff --git a/c/src/lib/libcpu/bfin/configure.ac b/c/src/lib/libcpu/bfin/configure.ac
deleted file mode 100644
index 4330957..0000000
--- a/c/src/lib/libcpu/bfin/configure.ac
+++ /dev/null
@@ -1,35 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([rtems-c-src-lib-libcpu-bfin],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
-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_CHECK_NETWORKING
-AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-
-# AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "bf52x")
-AM_CONDITIONAL(bf52x, test "$RTEMS_CPU_MODEL" = "bf52x")
-
-
-RTEMS_AMPOLISH3
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-])
-AC_OUTPUT
More information about the vc
mailing list