diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-19 16:59:47 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-19 17:03:00 -0500 |
| commit | 8200c9efaa5c885bd9607a758c9b6146d0245e74 (patch) | |
| tree | 268670cce0c99ef47a9894aab14d7395eb3d9e3b | |
| parent | powerpc/shared/irq/irq_init.c: Fix warnings (diff) | |
| download | rtems-8200c9efaa5c885bd9607a758c9b6146d0245e74.tar.bz2 | |
libcpu/powerpc configure logic: Do not built e500 components unused by qoriq
| -rw-r--r-- | c/src/lib/libcpu/powerpc/Makefile.am | 10 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/configure.ac | 8 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/preinstall.am | 5 |
3 files changed, 17 insertions, 6 deletions
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 15501de030..5b83288c6e 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -249,22 +249,26 @@ mpc6xx_altivec_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif EXTRA_DIST += mpc6xx/altivec/README -if e500 -# mpc6xx/clock +# e500/clock +if e500_clock include_libcpu_HEADERS += mpc6xx/clock/c_clock.h noinst_PROGRAMS += e500/clock.rel e500_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h e500_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) e500_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +endif -# mpc6xx/timer +# e500/timer +if e500_timer noinst_PROGRAMS += e500/timer.rel e500_timer_rel_SOURCES = mpc6xx/timer/timer.c e500_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) e500_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +endif # e500/mmu +if e500_mmu include_libcpu_HEADERS += e500/mmu/e500_mmu.h noinst_PROGRAMS += e500/mmu.rel e500_mmu_rel_SOURCES = e500/mmu/mmu.c e500/mmu/e500_mmu.h diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac index 86fb4f43aa..c107e223cc 100644 --- a/c/src/lib/libcpu/powerpc/configure.ac +++ b/c/src/lib/libcpu/powerpc/configure.ac @@ -72,7 +72,13 @@ AM_CONDITIONAL(ppc440, test "$RTEMS_CPU_MODEL" = "ppc440") AM_CONDITIONAL(ppc4xx, test "$RTEMS_CPU_MODEL" = "ppc403" \ || test "$RTEMS_CPU_MODEL" = "ppc405") -AM_CONDITIONAL(e500, test "$RTEMS_CPU_MODEL" = "e500" \ +AM_CONDITIONAL(e500_clock, test "$RTEMS_CPU_MODEL" = "e500" \ +|| test "$RTEMS_CPU_MODEL" = "ppc440") + +AM_CONDITIONAL(e500_timer, test "$RTEMS_CPU_MODEL" = "e500" \ +|| test "$RTEMS_CPU_MODEL" = "ppc440") + +AM_CONDITIONAL(e500_mmu, test "$RTEMS_CPU_MODEL" = "e500" \ || test "$RTEMS_CPU_MODEL" = "ppc440" \ || test "$RTEMS_CPU_MODEL" = "qoriq" ) diff --git a/c/src/lib/libcpu/powerpc/preinstall.am b/c/src/lib/libcpu/powerpc/preinstall.am index 129855e1e3..948cb3c5c9 100644 --- a/c/src/lib/libcpu/powerpc/preinstall.am +++ b/c/src/lib/libcpu/powerpc/preinstall.am @@ -160,11 +160,12 @@ $(PROJECT_INCLUDE)/libcpu/c_clock.h: mpc6xx/clock/c_clock.h $(PROJECT_INCLUDE)/l $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h endif -if e500 +if e500_clock $(PROJECT_INCLUDE)/libcpu/c_clock.h: mpc6xx/clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h - +endif +if e500_mmu $(PROJECT_INCLUDE)/libcpu/e500_mmu.h: e500/mmu/e500_mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/e500_mmu.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/e500_mmu.h |