[rtems commit] bsps/powerpc: Move BSP specific file to BSP

Sebastian Huber sebh at rtems.org
Tue Jan 16 09:44:19 UTC 2018


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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Jan 16 07:05:39 2018 +0100

bsps/powerpc: Move BSP specific file to BSP

Update #3254.

---

 c/src/lib/libbsp/powerpc/Makefile.am                                   | 2 +-
 c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am                  | 3 +--
 .../powerpc/{shared/vme => motorola_powerpc/include/bsp}/VMEConfig.h   | 0
 c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am                | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am
index 1309072..b28f6d5 100644
--- a/c/src/lib/libbsp/powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/Makefile.am
@@ -64,7 +64,7 @@ EXTRA_DIST += shared/startup/bspstart.c shared/startup/pgtbl_setup.c \
 EXTRA_DIST += shared/tod/todcfg.c
 
 ## shared/vme
-EXTRA_DIST += shared/vme/vmeconfig.c shared/vme/VMEConfig.h
+EXTRA_DIST += shared/vme/vmeconfig.c \
 	shared/vme/README shared/vme/vme_universe.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index dd7f91c..6e07723 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -120,7 +120,7 @@ libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
 include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
     ../../shared/vmeUniverse/vme_am_defs.h \
     ../../shared/vmeUniverse/VME.h \
-    ../../powerpc/shared/vme/VMEConfig.h \
+    include/bsp/VMEConfig.h \
     ../../shared/vmeUniverse/vmeUniverseDMA.h\
     ../../shared/vmeUniverse/bspVmeDmaList.h\
     ../../shared/vmeUniverse/VMEDMA.h
@@ -132,7 +132,6 @@ libbsp_a_SOURCES += ../../shared/vmeUniverse/vme_am_defs.h
 libbsp_a_SOURCES += ../../shared/vmeUniverse/VME.h
 libbsp_a_SOURCES += ../../powerpc/shared/vme/vmeconfig.c
 libbsp_a_SOURCES += ../../powerpc/shared/vme/vme_universe.c
-libbsp_a_SOURCES += ../../powerpc/shared/vme/VMEConfig.h
 
 if QEMU
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
rename to c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
index 97c33e4..d8c51da 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
@@ -121,7 +121,7 @@ $(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
 
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: ../../powerpc/shared/vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+$(PROJECT_INCLUDE)/bsp/VMEConfig.h: include/bsp/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
 




More information about the vc mailing list