Changeset a12dcff8 in rtems

Timestamp:

03/23/18 15:04:18 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

b8c468b

Parents:

0cab067

git-author:

Sebastian Huber <sebastian.huber@…> (03/23/18 15:04:18)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/26/18 08:40:48)

Message:

bsp/mpc8260: Move libcpu content to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

Files:

• bsps/powerpc/mpc8260ads/dev/console-generic.c (moved) (moved from c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c)
• bsps/powerpc/mpc8260ads/start/brg.c (moved) (moved from c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c)
• bsps/powerpc/mpc8260ads/start/cp.c (moved) (moved from c/src/lib/libcpu/powerpc/mpc8260/cpm/cp.c)
• bsps/powerpc/mpc8260ads/start/dpram.c (moved) (moved from c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c)
• bsps/powerpc/mpc8260ads/start/mmu.c (moved) (moved from c/src/lib/libcpu/powerpc/mpc8260/mmu/mmu.c)
• c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am (modified) (1 diff)
• c/src/lib/libcpu/powerpc/Makefile.am (modified) (1 diff)
• c/src/lib/libcpu/powerpc/mpc8260/README (deleted)

c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am

@@ -57 +57 @@
 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@/mpc8260/console-generic.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/dev/console-generic.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/brg.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/cp.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/dpram.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/mmu.c
 
 EXTRA_DIST += times

c/src/lib/libcpu/powerpc/Makefile.am

@@ -107 +107 @@
 endif
 
-EXTRA_DIST += mpc8260/README
-if mpc8260
-# mpc8260/console-generic
-noinst_PROGRAMS += mpc8260/console-generic.rel
-mpc8260_console_generic_rel_SOURCES = mpc8260/console-generic/console-generic.c \
-    mpc8260/include/console.h
-mpc8260_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8260_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc8260/cpm
-noinst_PROGRAMS += mpc8260/cpm.rel
-mpc8260_cpm_rel_SOURCES = mpc8260/cpm/cp.c mpc8260/cpm/dpram.c mpc8260/cpm/brg.c \
-    mpc8260/include/cpm.h
-mpc8260_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8260_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc8260/mmu
-noinst_PROGRAMS += mpc8260/mmu.rel
-mpc8260_mmu_rel_SOURCES = mpc8260/mmu/mmu.c \
-                          mpc8260/include/mmu.h
-mpc8260_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8260_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 include $(top_srcdir)/../../../automake/local.am