[rtems commit] bsps/powerpc: Move AltiVec support to bsps

Sebastian Huber sebh at rtems.org
Mon Mar 26 09:11:16 UTC 2018 

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Mar 26 06:57:10 2018 +0200

bsps/powerpc: Move AltiVec support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

---

 .../powerpc/mpc6xx => bsps/powerpc/shared}/altivec/README    |  0
 .../powerpc/mpc6xx => bsps/powerpc/shared}/altivec/vec_sup.c |  0
 .../mpc6xx => bsps/powerpc/shared}/altivec/vec_sup_asm.S     |  0
 c/src/lib/libbsp/powerpc/beatnik/Makefile.am                 | 12 +++++-------
 c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am        |  6 +++---
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am                | 10 +++-------
 c/src/lib/libbsp/powerpc/psim/Makefile.am                    |  4 ++--
 c/src/lib/libcpu/powerpc/Makefile.am                         |  9 ---------
 8 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/altivec/README b/bsps/powerpc/shared/altivec/README
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/altivec/README
rename to bsps/powerpc/shared/altivec/README
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/altivec/vec_sup.c b/bsps/powerpc/shared/altivec/vec_sup.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/altivec/vec_sup.c
rename to bsps/powerpc/shared/altivec/vec_sup.c
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/altivec/vec_sup_asm.S b/bsps/powerpc/shared/altivec/vec_sup_asm.S
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/altivec/vec_sup_asm.S
rename to bsps/powerpc/shared/altivec/vec_sup_asm.S
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index 08bec33..fa29c8c 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -158,11 +158,16 @@ network_if_em.rel: network_if_em_tmp.rel
 	$(OBJCOPY) -G rtems_em_attach -G net_driver_ticks_per_sec \
                    -G rtems_em_pci_setup -G rtems_em_early_link_check_ops \
                    $^ $@
+
+libbsp_a_LIBADD = network_support.rel \
+    network_if_mve.rel network_if_gfe.rel network_if_em.rel
 endif
 
 # tod
 libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
 
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
@@ -171,13 +176,6 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
-
-if HAS_NETWORKING
-libbsp_a_LIBADD += network_support.rel \
-    network_if_mve.rel network_if_gfe.rel network_if_em.rel
-endif
-
 EXTRA_DIST += README LICENSE
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index aa27a39..e3be115 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -114,6 +114,8 @@ libbsp_a_SOURCES += ../../i386/pc386/ne2000/ne2000.c
 endif
 endif
 
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
@@ -122,9 +124,7 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
 
-libbsp_a_LIBADD = \
-    polledIO.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
+libbsp_a_LIBADD = polledIO.rel
 
 EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \
               README.MVME2400 \
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 1ad78e0..450153a 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -66,6 +66,7 @@ network_rel_SOURCES = network/if_100MHz/GT64260eth.c \
     network/if_1GHz/if_wm.c network/if_1GHz/pci_map.c
 network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_LIBADD = network.rel
 endif
 
 EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
@@ -83,6 +84,8 @@ project_lib_DATA += mvme5500start.$(OBJEXT)
 project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.share
 
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
@@ -91,13 +94,6 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
 
-libbsp_a_LIBADD = \
-    ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
-
-if HAS_NETWORKING
-libbsp_a_LIBADD += network.rel
-endif
-
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 2192dab..49b809c 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -60,6 +60,8 @@ if HAS_NETWORKING
 libbsp_a_SOURCES += network/if_sim.c
 endif
 
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
@@ -68,8 +70,6 @@ libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
-
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 1c15f2c..9d19f0e 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -39,13 +39,4 @@ if ppc405
 ## ppc4xx/include
 endif # ppc405
 
-if mpc6xx
-# mpc6xx/altivec
-noinst_PROGRAMS += mpc6xx/altivec.rel
-mpc6xx_altivec_rel_SOURCES = mpc6xx/altivec/vec_sup.c mpc6xx/altivec/vec_sup_asm.S
-mpc6xx_altivec_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc6xx_altivec_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-EXTRA_DIST      += mpc6xx/altivec/README
-
 include $(top_srcdir)/../../../automake/local.am

More information about the vc mailing list