summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2015-03-09 15:47:47 -0500
committerJoel Sherrill <joel.sherrill@oarcorp.com>2015-03-09 16:15:14 -0500
commit5bc6237a364c26d734f478b652eba1e457cfbf7a (patch)
treed8f6343b94403ee984031174390d29c0157b817e
parentcpukit/libcrypt/misc.c: Conditionally correct 16-bit unclean code (diff)
downloadrtems-5bc6237a364c26d734f478b652eba1e457cfbf7a.tar.bz2
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.
-rw-r--r--c/src/lib/libbsp/m68k/idp/Makefile.am5
-rw-r--r--c/src/lib/libbsp/m68k/idp/include/motorola/mc68230.h (renamed from cpukit/libcsupport/include/motorola/mc68230.h)0
-rw-r--r--c/src/lib/libbsp/m68k/idp/include/motorola/mc68681.h (renamed from cpukit/libcsupport/include/motorola/mc68681.h)0
-rw-r--r--c/src/lib/libbsp/m68k/idp/preinstall.am13
-rw-r--r--cpukit/libcsupport/preinstall.am13
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 35f873e7a3..7dcba6d895 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
index 2f94e0011c..2f94e0011c 100644
--- a/cpukit/libcsupport/include/motorola/mc68230.h
+++ b/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
index 83a7d1f461..83a7d1f461 100644
--- a/cpukit/libcsupport/include/motorola/mc68681.h
+++ b/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 0a548ff024..fd9907b011 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 e56d94657b..e60879d4e4 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