[rtems commit] Move libcsupport/include/motorola/*.h to m68k/idp BSP
Joel Sherril
joel at rtems.org
Mon Mar 9 21:41:34 UTC 2015
Module: rtems
Branch: master
Commit: 5bc6237a364c26d734f478b652eba1e457cfbf7a
Changeset: http://git.rtems.org/rtems/commit/?id=5bc6237a364c26d734f478b652eba1e457cfbf7a
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Mon Mar 9 15:47:47 2015 -0500
Move libcsupport/include/motorola/*.h to m68k/idp BSP
These header files were only used by one BSP and they are
hardware dependent. The hardware dependency always made
them bad candidates for where they were in the tree. But
this fixes that.
---
c/src/lib/libbsp/m68k/idp/Makefile.am | 5 +++++
.../src/lib/libbsp/m68k/idp}/include/motorola/mc68230.h | 0
.../src/lib/libbsp/m68k/idp}/include/motorola/mc68681.h | 0
c/src/lib/libbsp/m68k/idp/preinstall.am | 13 +++++++++++++
cpukit/libcsupport/preinstall.am | 13 -------------
5 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am
index 35f873e..7dcba6d 100644
--- a/c/src/lib/libbsp/m68k/idp/Makefile.am
+++ b/c/src/lib/libbsp/m68k/idp/Makefile.am
@@ -16,6 +16,11 @@ DISTCLEANFILES = include/bspopts.h
include_HEADERS += include/leds.h
nodist_include_HEADERS += ../../shared/include/coverhd.h
+## Motorola device support files
+include_rtems_motoroladir = $(includedir)/rtems/motorola
+include_rtems_motorola_HEADERS = include/motorola/mc68230.h
+include_rtems_motorola_HEADERS += include/motorola/mc68681.h
+
noinst_LIBRARIES = libbspstart.a
libbspstart_a_SOURCES = ../../m68k/shared/start/start.S
project_lib_DATA = start.$(OBJEXT)
diff --git a/cpukit/libcsupport/include/motorola/mc68230.h b/c/src/lib/libbsp/m68k/idp/include/motorola/mc68230.h
similarity index 100%
rename from cpukit/libcsupport/include/motorola/mc68230.h
rename to c/src/lib/libbsp/m68k/idp/include/motorola/mc68230.h
diff --git a/cpukit/libcsupport/include/motorola/mc68681.h b/c/src/lib/libbsp/m68k/idp/include/motorola/mc68681.h
similarity index 100%
rename from cpukit/libcsupport/include/motorola/mc68681.h
rename to c/src/lib/libbsp/m68k/idp/include/motorola/mc68681.h
diff --git a/c/src/lib/libbsp/m68k/idp/preinstall.am b/c/src/lib/libbsp/m68k/idp/preinstall.am
index 0a548ff..fd9907b 100644
--- a/c/src/lib/libbsp/m68k/idp/preinstall.am
+++ b/c/src/lib/libbsp/m68k/idp/preinstall.am
@@ -61,6 +61,19 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/motorola
+ @: > $(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/motorola/mc68230.h: include/motorola/mc68230.h $(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/motorola/mc68230.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/motorola/mc68230.h
+
+$(PROJECT_INCLUDE)/rtems/motorola/mc68681.h: include/motorola/mc68681.h $(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/motorola/mc68681.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/motorola/mc68681.h
+
$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am
index e56d946..e60879d 100644
--- a/cpukit/libcsupport/preinstall.am
+++ b/cpukit/libcsupport/preinstall.am
@@ -54,19 +54,6 @@ $(PROJECT_INCLUDE)/rtems/vmeintr.h: include/vmeintr.h $(PROJECT_INCLUDE)/rtems/$
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vmeintr.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vmeintr.h
-$(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/motorola
- @: > $(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/motorola/mc68230.h: include/motorola/mc68230.h $(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/motorola/mc68230.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/motorola/mc68230.h
-
-$(PROJECT_INCLUDE)/rtems/motorola/mc68681.h: include/motorola/mc68681.h $(PROJECT_INCLUDE)/rtems/motorola/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/motorola/mc68681.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/motorola/mc68681.h
-
$(PROJECT_INCLUDE)/rtems/assoc.h: include/rtems/assoc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/assoc.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/assoc.h
More information about the vc
mailing list