From dc1ea019f3c5be4f45f0232fcac954b65610933f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 22 Mar 2018 06:27:31 +0100 Subject: [PATCH] bsps/mpc55xx: Move libcpu content to bsps This patch is a part of the BSP source reorganization. Update #3285. --- .../powerpc/mpc55xxevb/dev}/dspi.c | 0 .../powerpc/mpc55xxevb/start}/copy.S | 0 .../powerpc/mpc55xxevb/start}/edma.c | 0 .../powerpc/mpc55xxevb/start}/emios.c | 0 .../powerpc/mpc55xxevb/start}/flash_support.c | 0 .../powerpc/mpc55xxevb/start}/irq.c | 0 .../powerpc/mpc55xxevb/start}/siu.c | 0 .../lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 14 +++--- c/src/lib/libcpu/powerpc/Makefile.am | 46 ------------------- c/src/lib/libcpu/powerpc/configure.ac | 2 - c/src/lib/libcpu/powerpc/mpc55xx/fec/fec.c | 20 -------- 11 files changed, 7 insertions(+), 75 deletions(-) rename {c/src/lib/libcpu/powerpc/mpc55xx/dspi => bsps/powerpc/mpc55xxevb/dev}/dspi.c (100%) rename {c/src/lib/libcpu/powerpc/mpc55xx/misc => bsps/powerpc/mpc55xxevb/start}/copy.S (100%) rename {c/src/lib/libcpu/powerpc/mpc55xx/edma => bsps/powerpc/mpc55xxevb/start}/edma.c (100%) rename {c/src/lib/libcpu/powerpc/mpc55xx/emios => bsps/powerpc/mpc55xxevb/start}/emios.c (100%) rename {c/src/lib/libcpu/powerpc/mpc55xx/misc => bsps/powerpc/mpc55xxevb/start}/flash_support.c (100%) rename {c/src/lib/libcpu/powerpc/mpc55xx/irq => bsps/powerpc/mpc55xxevb/start}/irq.c (100%) rename {c/src/lib/libcpu/powerpc/mpc55xx/siu => bsps/powerpc/mpc55xxevb/start}/siu.c (100%) delete mode 100644 c/src/lib/libcpu/powerpc/mpc55xx/fec/fec.c diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/dspi/dspi.c b/bsps/powerpc/mpc55xxevb/dev/dspi.c similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc55xx/dspi/dspi.c rename to 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 similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S rename to 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 similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c rename to 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 similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc55xx/emios/emios.c rename to 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 similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c rename to 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 similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc55xx/irq/irq.c rename to 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 similarity index 100% rename from c/src/lib/libcpu/powerpc/mpc55xx/siu/siu.c rename to 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 @@ -167,52 +167,6 @@ endif # END: MPC83XX # ############################################################################## -############################################################################## -# 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 # ############################################################################## 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. - */