diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-03-22 06:27:31 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-03-22 07:26:32 +0100 |
commit | dc1ea019f3c5be4f45f0232fcac954b65610933f (patch) | |
tree | 1ac898f09cefa38ca0b2fb660fcac26386ffe4e5 | |
parent | bsps/mpc55xx: Remove unused files (diff) | |
download | rtems-dc1ea019f3c5be4f45f0232fcac954b65610933f.tar.bz2 |
bsps/mpc55xx: Move libcpu content to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
-rw-r--r-- | bsps/powerpc/mpc55xxevb/dev/dspi.c (renamed from c/src/lib/libcpu/powerpc/mpc55xx/dspi/dspi.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/start/copy.S (renamed from c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/start/edma.c (renamed from c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/start/emios.c (renamed from c/src/lib/libcpu/powerpc/mpc55xx/emios/emios.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/start/flash_support.c (renamed from c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/start/irq.c (renamed from c/src/lib/libcpu/powerpc/mpc55xx/irq/irq.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/start/siu.c (renamed from c/src/lib/libcpu/powerpc/mpc55xx/siu/siu.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/Makefile.am | 46 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/mpc55xx/fec/fec.c | 20 |
11 files changed, 7 insertions, 75 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/dspi/dspi.c b/bsps/powerpc/mpc55xxevb/dev/dspi.c index f6edb560b0..f6edb560b0 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/dspi/dspi.c +++ b/bsps/powerpc/mpc55xxevb/dev/dspi.c diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S b/bsps/powerpc/mpc55xxevb/start/copy.S index f993936752..f993936752 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S +++ b/bsps/powerpc/mpc55xxevb/start/copy.S diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c b/bsps/powerpc/mpc55xxevb/start/edma.c index c5d47705ec..c5d47705ec 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c +++ b/bsps/powerpc/mpc55xxevb/start/edma.c diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/emios/emios.c b/bsps/powerpc/mpc55xxevb/start/emios.c index 89873b4c67..89873b4c67 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/emios/emios.c +++ b/bsps/powerpc/mpc55xxevb/start/emios.c diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c b/bsps/powerpc/mpc55xxevb/start/flash_support.c index 1d94fda205..1d94fda205 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c +++ b/bsps/powerpc/mpc55xxevb/start/flash_support.c diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/irq/irq.c b/bsps/powerpc/mpc55xxevb/start/irq.c index 53c30f171e..53c30f171e 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/irq/irq.c +++ b/bsps/powerpc/mpc55xxevb/start/irq.c diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/siu/siu.c b/bsps/powerpc/mpc55xxevb/start/siu.c index 9801270a80..9801270a80 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/siu/siu.c +++ b/bsps/powerpc/mpc55xxevb/start/siu.c diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index 8cb70bb00d..bceb907241 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -108,13 +108,13 @@ endif libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c - -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/misc.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/siu.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/edma.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/emios.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dspi.rel +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 +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/emios.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/flash_support.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/irq.c +libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/siu.c include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index e83d47a772..b2f03b64fe 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -168,52 +168,6 @@ endif ############################################################################## ############################################################################## -# START: MPC55XX # -############################################################################## -if mpc55xx - -# IRQ -noinst_PROGRAMS += mpc55xx/irq.rel -mpc55xx_irq_rel_SOURCES = mpc55xx/irq/irq.c -mpc55xx_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# FEC -noinst_PROGRAMS += mpc55xx/fec.rel -mpc55xx_fec_rel_SOURCES = mpc55xx/fec/fec.c -mpc55xx_fec_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# eDMA -noinst_PROGRAMS += mpc55xx/edma.rel -mpc55xx_edma_rel_SOURCES = mpc55xx/edma/edma.c -mpc55xx_edma_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# eMIOS -noinst_PROGRAMS += mpc55xx/emios.rel -mpc55xx_emios_rel_SOURCES = mpc55xx/emios/emios.c -mpc55xx_emios_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# SIU -noinst_PROGRAMS += mpc55xx/siu.rel -mpc55xx_siu_rel_SOURCES = mpc55xx/siu/siu.c -mpc55xx_siu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# DSPI -noinst_PROGRAMS += mpc55xx/dspi.rel -mpc55xx_dspi_rel_SOURCES = mpc55xx/dspi/dspi.c -mpc55xx_dspi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# Misc -noinst_PROGRAMS += mpc55xx/misc.rel -mpc55xx_misc_rel_SOURCES = mpc55xx/misc/copy.S \ - mpc55xx/misc/flash_support.c -mpc55xx_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -endif -############################################################################## -# END: MPC55XX # -############################################################################## - -############################################################################## # START: QorIQ # ############################################################################## if qoriq diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac index 3d85e2b25f..8b91859bc5 100644 --- a/c/src/lib/libcpu/powerpc/configure.ac +++ b/c/src/lib/libcpu/powerpc/configure.ac @@ -27,7 +27,6 @@ AM_CONDITIONAL(shared, \ || test "$RTEMS_CPU_MODEL" = "mpc7400" \ || test "$RTEMS_CPU_MODEL" = "mpc7455" \ || test "$RTEMS_CPU_MODEL" = "mpc555" \ -|| test "$RTEMS_CPU_MODEL" = "mpc55xx" \ || test "$RTEMS_CPU_MODEL" = "ppc405" \ || test "$RTEMS_CPU_MODEL" = "ppc440" \ || test "$RTEMS_CPU_MODEL" = "mpc604" \ @@ -40,7 +39,6 @@ AM_CONDITIONAL(shared, \ || test "$RTEMS_CPU_MODEL" = "e500") # test on CPU type -AM_CONDITIONAL(mpc55xx, test "$RTEMS_CPU_MODEL" = "mpc55xx") AM_CONDITIONAL(mpc5xx, test "$RTEMS_CPU_MODEL" = "mpc555" ) AM_CONDITIONAL(mpc6xx, test "$RTEMS_CPU_MODEL" = "mpc6xx" \ || test "$RTEMS_CPU_MODEL" = "mpc604" \ diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/fec/fec.c b/c/src/lib/libcpu/powerpc/mpc55xx/fec/fec.c deleted file mode 100644 index 11016b4aea..0000000000 --- a/c/src/lib/libcpu/powerpc/mpc55xx/fec/fec.c +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * - * @ingroup mpc55xx - * - * @brief Empty file. - */ - -/* - * Copyright (c) 2008 - * Embedded Brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * rtems@embedded-brains.de - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ |