Changeset b8c468b in rtems

Timestamp:

03/23/18 15:11:55 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

11fe8c59

Parents:

a12dcff8

git-author:

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

git-committer:

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

Message:

bsp/tqm8xx: Move libcpu content to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

Files:

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

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

@@ -65 +65 @@
 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@/mpc8xx/console-generic.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8xx/cpm.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/dev/console-generic.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/cp.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/dpram.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/mmu.c
 
 include $(top_srcdir)/../../../../automake/local.am

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

@@ -80 +80 @@
 endif
 
-EXTRA_DIST += mpc8xx/README
-if mpc8xx
-# mpc8xx/clock
-noinst_PROGRAMS += mpc8xx/clock.rel
-mpc8xx_clock_rel_SOURCES = mpc8xx/clock/clock.c
-mpc8xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc8xx/console-generic
-noinst_PROGRAMS += mpc8xx/console-generic.rel
-mpc8xx_console_generic_rel_SOURCES = mpc8xx/console-generic/console-generic.c
-mpc8xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc8xx/cpm
-noinst_PROGRAMS += mpc8xx/cpm.rel
-mpc8xx_cpm_rel_SOURCES = mpc8xx/cpm/cp.c mpc8xx/cpm/dpram.c
-mpc8xx_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8xx_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# mpc8xx/mmu
-noinst_PROGRAMS += mpc8xx/mmu.rel
-mpc8xx_mmu_rel_SOURCES = mpc8xx/mmu/mmu.c
-mpc8xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc8xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 include $(top_srcdir)/../../../automake/local.am