RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Move contents of libcsupport/include/zilog into libbsp/shared

Browse Source 
Only a few BSPs use this and it should not have been in libcsupport.
This commit is contained in:
Joel Sherrill
2015-03-09 16:07:36 -05:00
parent 6796d9cd69
commit 1aa7b8beb1
10 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/m68k/mvme136/Makefile.am
View File

@@ -16,6 +16,10 @@ noinst_PROGRAMS =
include_HEADERS += include/coverhd.h
## Zilog component header files
include_rtems_zilogdir = $(includedir)/rtems/zilog
include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.h
noinst_LIBRARIES = libbspstart.a
libbspstart_a_SOURCES = ../../m68k/shared/start/start.S
project_lib_DATA = start.$(OBJEXT)

9
c/src/lib/libbsp/m68k/mvme136/preinstall.am
View File

@@ -57,6 +57,15 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
@: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: ../../shared/include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)

4
c/src/lib/libbsp/m68k/mvme147/Makefile.am
View File

@@ -16,6 +16,10 @@ noinst_PROGRAMS =
include_HEADERS += include/coverhd.h
## Zilog component header files
include_rtems_zilogdir = $(includedir)/rtems/zilog
include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h
noinst_LIBRARIES = libbspstart.a
libbspstart_a_SOURCES = ../../m68k/shared/start/start.S
project_lib_DATA = start.$(OBJEXT)

9
c/src/lib/libbsp/m68k/mvme147/preinstall.am
View File

@@ -57,6 +57,15 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
@: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)

4
c/src/lib/libbsp/m68k/mvme162/Makefile.am
View File

@@ -19,6 +19,10 @@ include_HEADERS += include/page_table.h
nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h
## Zilog component header files
include_rtems_zilogdir = $(includedir)/rtems/zilog
include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.h
noinst_LIBRARIES = libbspstart.a
libbspstart_a_SOURCES = ../../m68k/shared/start/start.S
project_lib_DATA = start.$(OBJEXT)

9
c/src/lib/libbsp/m68k/mvme162/preinstall.am
View File

@@ -65,6 +65,15 @@ $(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PRO
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
@: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: ../../shared/include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)

0
cpukit/libcsupport/include/zilog/z8036.h → c/src/lib/libbsp/shared/include/zilog/z8036.h
View File

0
cpukit/libcsupport/include/zilog/z8530.h → c/src/lib/libbsp/shared/include/zilog/z8530.h
View File

7
cpukit/libcsupport/Makefile.am
View File

@@ -26,13 +26,6 @@ include_rtems_HEADERS += include/rtems/malloc.h
include_rtems_HEADERS += include/rtems/termiostypes.h
include_rtems_HEADERS += include/rtems/gxx_wrappers.h
## zilog
include_rtems_zilogdir = $(includedir)/rtems/zilog
include_rtems_zilog_HEADERS = include/zilog/z8036.h
include_rtems_zilog_HEADERS += include/zilog/z8530.h
## General stuff
ERROR_C_FILES = src/error.c src/__assert.c

13
cpukit/libcsupport/preinstall.am
View File

@@ -90,16 +90,3 @@ $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h: include/rtems/gxx_wrappers.h $(PROJECT_
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h
$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
@: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.h