[rtems commit] bsp/gumstix: Move libcpu files to BSP
Sebastian Huber
sebh at rtems.org
Fri Dec 8 12:06:22 UTC 2017
Module: rtems
Branch: master
Commit: e9d61145e17c1eaee36a82593754133d51072e0c
Changeset: http://git.rtems.org/rtems/commit/?id=e9d61145e17c1eaee36a82593754133d51072e0c
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Fri Dec 8 07:32:10 2017 +0100
bsp/gumstix: Move libcpu files to BSP
Update #3254.
---
c/src/lib/libbsp/arm/gumstix/Makefile.am | 13 ++++++----
.../pxa255 => libbsp/arm/gumstix}/clock/clock.c | 0
.../ffuart => libbsp/arm/gumstix/console}/ffuart.c | 0
.../irq => libbsp/arm/gumstix/include/bsp}/irq.h | 0
.../pxa255 => libbsp/arm/gumstix}/include/ffuart.h | 0
.../pxa255 => libbsp/arm/gumstix}/include/pxa255.h | 0
.../arm/pxa255 => libbsp/arm/gumstix}/irq/irq.c | 0
.../lib/libbsp/arm/gumstix/make/custom/gumstix.cfg | 2 +-
c/src/lib/libbsp/arm/gumstix/preinstall.am | 12 +++++++++
.../pxa255 => libbsp/arm/gumstix}/timer/timer.c | 0
c/src/lib/libcpu/arm/Makefile.am | 30 ----------------------
c/src/lib/libcpu/arm/configure.ac | 3 +--
c/src/lib/libcpu/arm/preinstall.am | 13 ----------
13 files changed, 22 insertions(+), 51 deletions(-)
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 4210457..c12dbf4 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -9,6 +9,8 @@ dist_project_lib_DATA = bsp_specs
include_HEADERS = include/bsp.h
include_HEADERS += include/tm27.h
+include_HEADERS += include/pxa255.h
+include_HEADERS += include/ffuart.h
include_bsp_HEADERS =
@@ -35,20 +37,25 @@ libbsp_a_SOURCES += \
../../shared/bspclean.c startup/bspstart.c startup/bspreset.c startup/memmap.c
libbsp_a_SOURCES += ../../shared/cpucounterread.c
libbsp_a_SOURCES += ../../shared/cpucounterdiff.c
+libbsp_a_SOURCES += clock/clock.c
+libbsp_a_SOURCES += timer/timer.c
#console
libbsp_a_SOURCES += console/uarts.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
+libbsp_a_SOURCES += console/ffuart.c
# IRQ
include_bsp_HEADERS += ../../shared/include/irq-generic.h \
../../shared/include/irq-info.h
+include_bsp_HEADERS += include/bsp/irq.h
libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
libbsp_a_SOURCES += ../../shared/src/irq-generic.c
libbsp_a_SOURCES += ../../shared/src/irq-info.c
libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
libbsp_a_SOURCES += ../../shared/src/irq-server.c
libbsp_a_SOURCES += ../../shared/src/irq-shell.c
+libbsp_a_SOURCES += irq/irq.c
# Cache
libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
@@ -67,11 +74,7 @@ rtl8019_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
endif
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/ffuart.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
if ON_SKYEYE
if HAS_NETWORKING
diff --git a/c/src/lib/libcpu/arm/pxa255/clock/clock.c b/c/src/lib/libbsp/arm/gumstix/clock/clock.c
similarity index 100%
rename from c/src/lib/libcpu/arm/pxa255/clock/clock.c
rename to c/src/lib/libbsp/arm/gumstix/clock/clock.c
diff --git a/c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c b/c/src/lib/libbsp/arm/gumstix/console/ffuart.c
similarity index 100%
rename from c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c
rename to c/src/lib/libbsp/arm/gumstix/console/ffuart.c
diff --git a/c/src/lib/libcpu/arm/pxa255/irq/irq.h b/c/src/lib/libbsp/arm/gumstix/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libcpu/arm/pxa255/irq/irq.h
rename to c/src/lib/libbsp/arm/gumstix/include/bsp/irq.h
diff --git a/c/src/lib/libcpu/arm/pxa255/include/ffuart.h b/c/src/lib/libbsp/arm/gumstix/include/ffuart.h
similarity index 100%
rename from c/src/lib/libcpu/arm/pxa255/include/ffuart.h
rename to c/src/lib/libbsp/arm/gumstix/include/ffuart.h
diff --git a/c/src/lib/libcpu/arm/pxa255/include/pxa255.h b/c/src/lib/libbsp/arm/gumstix/include/pxa255.h
similarity index 100%
rename from c/src/lib/libcpu/arm/pxa255/include/pxa255.h
rename to c/src/lib/libbsp/arm/gumstix/include/pxa255.h
diff --git a/c/src/lib/libcpu/arm/pxa255/irq/irq.c b/c/src/lib/libbsp/arm/gumstix/irq/irq.c
similarity index 100%
rename from c/src/lib/libcpu/arm/pxa255/irq/irq.c
rename to c/src/lib/libbsp/arm/gumstix/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg b/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg
index a8d9fd3..d42b446 100644
--- a/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg
+++ b/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg
@@ -5,7 +5,7 @@
include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU=arm
-RTEMS_CPU_MODEL=pxa255
+RTEMS_CPU_MODEL=shared
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/arm/gumstix/preinstall.am b/c/src/lib/libbsp/arm/gumstix/preinstall.am
index 23dbe2a..99477a8 100644
--- a/c/src/lib/libbsp/arm/gumstix/preinstall.am
+++ b/c/src/lib/libbsp/arm/gumstix/preinstall.am
@@ -45,6 +45,14 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
+$(PROJECT_INCLUDE)/pxa255.h: include/pxa255.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pxa255.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/pxa255.h
+
+$(PROJECT_INCLUDE)/ffuart.h: include/ffuart.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ffuart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/ffuart.h
+
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
@@ -69,6 +77,10 @@ $(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
+$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
+
if ON_SKYEYE
endif
if ON_SKYEYE
diff --git a/c/src/lib/libcpu/arm/pxa255/timer/timer.c b/c/src/lib/libbsp/arm/gumstix/timer/timer.c
similarity index 100%
rename from c/src/lib/libcpu/arm/pxa255/timer/timer.c
rename to c/src/lib/libbsp/arm/gumstix/timer/timer.c
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 83fe0d5..c80f233 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -25,36 +25,6 @@ shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src
shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
-if pxa255
-include_HEADERS = pxa255/include/pxa255.h pxa255/include/ffuart.h
-
-## pxa255/clock
-noinst_PROGRAMS += pxa255/clock.rel
-pxa255_clock_rel_SOURCES = pxa255/clock/clock.c
-pxa255_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-pxa255_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## pxa255/timer
-noinst_PROGRAMS += pxa255/timer.rel
-pxa255_timer_rel_SOURCES = pxa255/timer/timer.c
-pxa255_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-pxa255_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## pxa255/ffuart
-noinst_PROGRAMS += pxa255/ffuart.rel
-pxa255_ffuart_rel_SOURCES = pxa255/ffuart/ffuart.c
-pxa255_ffuart_rel_CPPFLAGS = $(AM_CPPFLAGS)
-pxa255_ffuart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## pxa255/interrupt
-include_bsp_HEADERS += pxa255/irq/irq.h
-noinst_PROGRAMS += pxa255/irq.rel
-pxa255_irq_rel_SOURCES = pxa255/irq/irq.c \
- pxa255/irq/irq.h
-pxa255_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
-pxa255_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
if at91rm9200
include_HEADERS = at91rm9200/include/at91rm9200.h at91rm9200/include/at91rm9200_dbgu.h \
at91rm9200/include/at91rm9200_emac.h at91rm9200/include/at91rm9200_gpio.h \
diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac
index 81edac8..ed0f414 100644
--- a/c/src/lib/libcpu/arm/configure.ac
+++ b/c/src/lib/libcpu/arm/configure.ac
@@ -24,12 +24,11 @@ AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "arm1136" || \
test "$RTEMS_CPU_MODEL" = "mc9328mxl" || \
test "$RTEMS_CPU_MODEL" = "s3c2410" || \
test "$RTEMS_CPU_MODEL" = "s3c2400" || \
- test "$RTEMS_CPU_MODEL" = "pxa255")
+ test "$RTEMS_CPU_MODEL" = "shared")
AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200")
AM_CONDITIONAL(mc9328mxl, test "$RTEMS_CPU_MODEL" = "mc9328mxl")
AM_CONDITIONAL(lpc22xx, test "$RTEMS_CPU_MODEL" = "lpc22xx")
-AM_CONDITIONAL(pxa255, test "$RTEMS_CPU_MODEL" = "pxa255")
AM_CONDITIONAL(s3c24xx, test "$RTEMS_CPU_MODEL" = "s3c2400" ||\
test "$RTEMS_CPU_MODEL" = "s3c2410")
diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am
index 751a085..9c83ab4 100644
--- a/c/src/lib/libcpu/arm/preinstall.am
+++ b/c/src/lib/libcpu/arm/preinstall.am
@@ -37,19 +37,6 @@ $(PROJECT_INCLUDE)/libcpu/arm-cp15.h: shared/include/arm-cp15.h $(PROJECT_INCLUD
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
endif
-if pxa255
-$(PROJECT_INCLUDE)/pxa255.h: pxa255/include/pxa255.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pxa255.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pxa255.h
-
-$(PROJECT_INCLUDE)/ffuart.h: pxa255/include/ffuart.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ffuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ffuart.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: pxa255/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-endif
if at91rm9200
$(PROJECT_INCLUDE)/at91rm9200.h: at91rm9200/include/at91rm9200.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200.h
More information about the vc
mailing list