[rtems commit] bsps/powerpc: Move libcpu content to bsps

Mon Mar 26 09:10:23 UTC 2018

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Mar 23 15:54:12 2018 +0100

bsps/powerpc: Move libcpu content to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

---

 .../mpc83xx/gtm => bsps/powerpc/gen83xx/dev}/gtm.c |  0
 .../powerpc/gen83xx/dev}/mpc83xx_i2cdrv.c          |  0
 .../powerpc/gen83xx/dev}/mpc83xx_spidrv.c          |  0
 .../network => bsps/powerpc/shared/net}/tsec.c     |  0
 c/src/lib/libbsp/powerpc/gen83xx/Makefile.am       | 10 ++--
 c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am    |  4 +-
 c/src/lib/libbsp/powerpc/qoriq/Makefile.am         |  2 +-
 c/src/lib/libcpu/powerpc/Makefile.am               | 54 ----------------------
 8 files changed, 8 insertions(+), 62 deletions(-)

diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/gtm/gtm.c b/bsps/powerpc/gen83xx/dev/gtm.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/gtm/gtm.c
rename to bsps/powerpc/gen83xx/dev/gtm.c
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c b/bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c
rename to bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.c b/bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.c
rename to bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c b/bsps/powerpc/shared/net/tsec.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c
rename to bsps/powerpc/shared/net/tsec.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index a0eb6eb..f52991b 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -75,15 +75,15 @@ libbsp_a_SOURCES += spi/spi_init.c
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/gtm.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel   \
-	../../../libcpu/@RTEMS_CPU@/mpc83xx/i2c.rel  \
-	../../../libcpu/@RTEMS_CPU@/mpc83xx/spi.rel \
-	../../../libcpu/@RTEMS_CPU@/mpc83xx/gtm.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel
 
 if HAS_NETWORKING
 libbsp_a_SOURCES += network/network.c
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mpc83xx/tsec.rel
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
 EXTRA_DIST += README.mpc8349eamds
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index bceb907..3ed16c5 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -95,8 +95,7 @@ libbsp_a_SOURCES += ../../shared/src/irq-shell.c
 libbsp_a_SOURCES += startup/sd-card-init.c
 
 # I2C
-libbsp_a_SOURCES += i2c/i2c_init.c \
-    ../../../libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c
+libbsp_a_SOURCES += i2c/i2c_init.c
 
 # Network
 if HAS_NETWORKING
@@ -108,6 +107,7 @@ endif
 
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/dev/dspi.c
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/copy.S
 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/edma.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 832e67d..670af9d 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -103,7 +103,7 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/mmu.rel
 if HAS_NETWORKING
 libbsp_a_SOURCES += network/network.c \
 	network/if_intercom.c
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tsec.rel
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
 if HAS_SMP
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index b2f03b6..6bef209 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -130,58 +130,4 @@ mpc8260_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8260_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-##############################################################################
-# START: MPC83XX                                                             #
-##############################################################################
-if mpc83xx
-
-# Includes
-
-# Network
-if HAS_NETWORKING
-noinst_PROGRAMS += mpc83xx/tsec.rel
-mpc83xx_tsec_rel_SOURCES = mpc83xx/network/tsec.c
-mpc83xx_tsec_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-# i2c
-noinst_PROGRAMS += mpc83xx/i2c.rel
-mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \
-	mpc83xx/i2c/mpc83xx_i2cdrv.h
-mpc83xx_i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# SPI
-noinst_PROGRAMS += mpc83xx/spi.rel
-mpc83xx_spi_rel_SOURCES = mpc83xx/spi/mpc83xx_spidrv.c \
-	mpc83xx/spi/mpc83xx_spidrv.h
-mpc83xx_spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# GTM
-noinst_PROGRAMS += mpc83xx/gtm.rel
-mpc83xx_gtm_rel_SOURCES = mpc83xx/gtm/gtm.c \
-	mpc83xx/include/gtm.h
-mpc83xx_gtm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-endif
-##############################################################################
-# END: MPC83XX                                                               #
-##############################################################################
-
-##############################################################################
-# START: QorIQ                                                               #
-##############################################################################
-if qoriq
-
-# Network
-if HAS_NETWORKING
-noinst_PROGRAMS += tsec.rel
-tsec_rel_SOURCES = mpc83xx/network/tsec.c
-tsec_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-endif
-##############################################################################
-# END: QorIQ                                                                 #
-##############################################################################
-
 include $(top_srcdir)/../../../automake/local.am

