From 79262a320ad64f0f43412eee95a2ccd497cc2456 Mon Sep 17 00:00:00 2001 From: Till Straumann Date: Sun, 9 Dec 2007 06:42:14 +0000 Subject: [PATCH] 2007-12-08 Till Straumann * Makefile.am: merged shared/vme/vme_universe.c and shared/vme/vme_universe_dma.c into one file. --- c/src/lib/libbsp/powerpc/ep1a/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/ep1a/Makefile.am | 1 - c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 1 - c/src/lib/libbsp/powerpc/mvme5500/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/score603e/Makefile.am | 3 +-- 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index aaf31bb4ef..8076bf4e38 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog @@ -1,3 +1,8 @@ +2007-12-08 Till Straumann + + * Makefile.am: merged shared/vme/vme_universe.c and + shared/vme/vme_universe_dma.c into one file. + 2007-12-08 Till Straumann * vme/VMEConfig.h: added error status to diff --git a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am index 2738974966..2f8077ec25 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am @@ -104,7 +104,6 @@ noinst_PROGRAMS += vme.rel vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../shared/vme/vmeconfig.c \ - ../shared/vme/vme_universe_dma.c \ ../shared/vme/vme_universe.c \ ../../shared/vmeUniverse/vme_am_defs.h vme_rel_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 7f96eaa729..08a9613e6d 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,8 @@ +2007-12-08 Till Straumann + + * Makefile.am: merged shared/vme/vme_universe.c and + shared/vme/vme_universe_dma.c into one file. + 2007-12-08 Till Straumann * Makefile.am: irq_supp.h was moved from shared/irq to diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index aee01e6ef6..fdf83ed8ae 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -153,7 +153,6 @@ vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/VME.h \ ../../powerpc/shared/vme/vmeconfig.c \ ../../powerpc/shared/vme/vme_universe.c \ - ../../powerpc/shared/vme/vme_universe_dma.c \ ../../powerpc/shared/vme/VMEConfig.h vme_rel_CPPFLAGS = $(AM_CPPFLAGS) vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index 09a0b6bb2e..4666a3bdc7 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,8 @@ +2007-12-08 Till Straumann + + * Makefile.am: merged shared/vme/vme_universe.c and + shared/vme/vme_universe_dma.c into one file. + 2007-12-08 Till Straumann * vme/VMEConfig.h: added error status to diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index 78171f504d..476c389207 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -125,7 +125,7 @@ include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h \ noinst_PROGRAMS += vme.rel vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c\ ../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\ - ../shared/vme/vme_universe.c ../shared/vme/vme_universe_dma.c + ../shared/vme/vme_universe.c vme_rel_CPPFLAGS = $(AM_CPPFLAGS) vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 5beafaf4f1..365d8b2c3c 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,8 @@ +2007-12-08 Till Straumann + + * Makefile.am: merged shared/vme/vme_universe.c and + shared/vme/vme_universe_dma.c into one file. + 2007-12-08 Till Straumann * vme/VMEConfig.h: added error status to diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 1b882e801a..ad4d0bcb55 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -94,8 +94,7 @@ vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../../shared/vmeUniverse/vme_am_defs.h \ ../shared/vme/vmeconfig.c \ - ../shared/vme/vme_universe.c \ - ../shared/vme/vme_universe_dma.c + ../shared/vme/vme_universe.c vme_rel_CPPFLAGS = $(AM_CPPFLAGS) vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)