[rtems commit] bsps/powerpc: Move MMU support to bsps
Sebastian Huber
sebh at rtems.org
Mon Mar 26 09:10:55 UTC 2018
Module: rtems
Branch: master
Commit: 11fe8c59c6c145bca52e977363183add0fbe1b59
Changeset: http://git.rtems.org/rtems/commit/?id=11fe8c59c6c145bca52e977363183add0fbe1b59
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Mon Mar 26 06:18:51 2018 +0200
bsps/powerpc: Move MMU support to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
---
.../powerpc/mpc6xx => bsps/powerpc/shared}/mmu/bat.c | 0
.../e500/mmu/mmu.c => bsps/powerpc/shared/mmu/e500-mmu.c | 0
.../powerpc/mpc6xx => bsps/powerpc/shared}/mmu/mmuAsm.S | 0
.../powerpc/mpc6xx => bsps/powerpc/shared}/mmu/pte121.c | 0
c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 4 +++-
c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 5 +++--
c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 5 +++--
c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 4 +++-
c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 4 +++-
c/src/lib/libbsp/powerpc/psim/Makefile.am | 4 +++-
c/src/lib/libbsp/powerpc/qemuppc/Makefile.am | 5 +++--
c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 3 +--
c/src/lib/libcpu/powerpc/Makefile.am | 16 ----------------
14 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.c b/bsps/powerpc/shared/mmu/bat.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.c
rename to bsps/powerpc/shared/mmu/bat.c
diff --git a/c/src/lib/libcpu/powerpc/e500/mmu/mmu.c b/bsps/powerpc/shared/mmu/e500-mmu.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/e500/mmu/mmu.c
rename to bsps/powerpc/shared/mmu/e500-mmu.c
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S b/bsps/powerpc/shared/mmu/mmuAsm.S
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S
rename to bsps/powerpc/shared/mmu/mmuAsm.S
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c b/bsps/powerpc/shared/mmu/pte121.c
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
rename to bsps/powerpc/shared/mmu/pte121.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index d9a45d6..a37ecb4 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -164,11 +164,13 @@ endif
libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 5f9b3da..ac24726 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -111,10 +111,11 @@ libbsp_a_SOURCES += network_5200/network.c
endif
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel
-
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index f52991b..de69eef 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -74,13 +74,14 @@ libbsp_a_SOURCES += i2c/i2c_init.c
libbsp_a_SOURCES += spi/spi_init.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.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
-
if HAS_NETWORKING
libbsp_a_SOURCES += network/network.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 75139b0..be72435 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -115,13 +115,15 @@ endif
endif
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
libbsp_a_LIBADD = \
polledIO.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index d0ddfa6..4804344 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -107,10 +107,10 @@ endif
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/e500/mmu.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel
if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index c85cd88..f927258 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -84,12 +84,14 @@ project_lib_DATA += linkcmds
dist_project_lib_DATA += ../shared/startup/linkcmds.share
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
libbsp_a_LIBADD = \
../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 18bb28d..d620efa 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -61,11 +61,13 @@ libbsp_a_SOURCES += network/if_sim.c
endif
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 2b268bc..0aabf79 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -52,10 +52,11 @@ libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
$(irq_SOURCES)
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel
-
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/powerpc/shared/shared.am
include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions.am
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 670af9d..31d5c2e 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -97,8 +97,7 @@ libbsp_a_SOURCES += shmsupp/lock.S \
shmsupp/intercom-mpci.c
libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/mmu.rel
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
if HAS_NETWORKING
libbsp_a_SOURCES += network/network.c \
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 5f5813d..f61524f 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -41,14 +41,6 @@ endif # ppc405
if mpc6xx
-# mpc6xx/mmu
-noinst_PROGRAMS += mpc6xx/mmu.rel
-mpc6xx_mmu_rel_SOURCES = mpc6xx/mmu/bat.c mpc6xx/mmu/bat.h \
- mpc6xx/mmu/pte121.c mpc6xx/mmu/pte121.h \
- mpc6xx/mmu/mmuAsm.S
-mpc6xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mpc6xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
# mpc6xx/clock
noinst_PROGRAMS += mpc6xx/clock.rel
mpc6xx_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h
@@ -71,12 +63,4 @@ e500_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
e500_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
-# e500/mmu
-if e500_mmu
-noinst_PROGRAMS += e500/mmu.rel
-e500_mmu_rel_SOURCES = e500/mmu/mmu.c e500/mmu/e500_mmu.h
-e500_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
-e500_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
include $(top_srcdir)/../../../automake/local.am
More information about the vc
mailing list