[rtems commit] arm: Move <libcpu/arm-cp15.h> to cpukit

Sebastian Huber sebh at rtems.org
Wed Dec 13 08:07:43 UTC 2017


Module:    rtems
Branch:    master
Commit:    8e8cf723a3c7048e4418781a494cba82042b645b
Changeset: http://git.rtems.org/rtems/commit/?id=8e8cf723a3c7048e4418781a494cba82042b645b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Dec 13 08:42:34 2017 +0100

arm: Move <libcpu/arm-cp15.h> to cpukit

Update #3254.

---

 c/src/lib/libcpu/arm/Makefile.am                                 | 1 -
 c/src/lib/libcpu/arm/preinstall.am                               | 4 ----
 cpukit/score/cpu/arm/Makefile.am                                 | 3 +++
 .../include => cpukit/score/cpu/arm/include/libcpu}/arm-cp15.h   | 0
 cpukit/score/cpu/arm/preinstall.am                               | 9 +++++++++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 12174ea..7f76673 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -16,7 +16,6 @@ include_libcpu_HEADERS =
 if shared
 
 include_libcpu_HEADERS += shared/include/mmu.h
-include_libcpu_HEADERS += shared/include/arm-cp15.h
 
 ## shared/arm920
 noinst_PROGRAMS += shared/arm920.rel
diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am
index fbdff20..31e0da2 100644
--- a/c/src/lib/libcpu/arm/preinstall.am
+++ b/c/src/lib/libcpu/arm/preinstall.am
@@ -27,8 +27,4 @@ if shared
 $(PROJECT_INCLUDE)/libcpu/mmu.h: shared/include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
-
-$(PROJECT_INCLUDE)/libcpu/arm-cp15.h: shared/include/arm-cp15.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
 endif
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index 6e98ed5..a0881e8 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -12,6 +12,9 @@ include_rtems_score_HEADERS += rtems/score/armv7m.h
 include_rtems_score_HEADERS += rtems/score/types.h
 include_rtems_score_HEADERS += rtems/score/cpuatomic.h
 
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS = include/libcpu/arm-cp15.h
+
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 libscorecpu_a_SOURCES =
diff --git a/c/src/lib/libcpu/arm/shared/include/arm-cp15.h b/cpukit/score/cpu/arm/include/libcpu/arm-cp15.h
similarity index 100%
rename from c/src/lib/libcpu/arm/shared/include/arm-cp15.h
rename to cpukit/score/cpu/arm/include/libcpu/arm-cp15.h
diff --git a/cpukit/score/cpu/arm/preinstall.am b/cpukit/score/cpu/arm/preinstall.am
index 15a0f08..3bdbb63 100644
--- a/cpukit/score/cpu/arm/preinstall.am
+++ b/cpukit/score/cpu/arm/preinstall.am
@@ -59,3 +59,12 @@ $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_IN
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
 
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/arm-cp15.h: include/libcpu/arm-cp15.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
+




More information about the vc mailing list