From bfcefdd435bcf6c688f9727b7b480b173d6ecce7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 24 Sep 2008 07:34:21 +0000 Subject: =?UTF-8?q?2008-09-24=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Makefile.am: Eliminates libcpudir. --- c/src/lib/libbsp/powerpc/gen5200/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 22 +++++++++----------- c/src/lib/libbsp/powerpc/gen83xx/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 24 ++++++++++------------ c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 24 ++++++++++------------ c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 27 +++++++++++-------------- 8 files changed, 60 insertions(+), 53 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog index 643c44986c..90c72b88f1 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog @@ -1,3 +1,7 @@ +2008-09-24 Ralf Corsépius + + * Makefile.am: Eliminates libcpudir. + 2008-09-08 Ralf Corsépius * i2c/i2c.c: Remove rtems_boolean having crept in again. diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 1ed91960b9..9336df1353 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -7,8 +7,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -libcpudir = ../../../libcpu/@RTEMS_CPU@ - dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include/i2cdrv.h include/u-boot.h \ @@ -65,8 +63,8 @@ console_SOURCES = console/console.c i2c_SOURCES = i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h ide_SOURCES = ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h -include_bsp_HEADERS = $(libcpudir)/new-exceptions/bspsupport/vectors.h \ - $(libcpudir)/new-exceptions/bspsupport/ppc_exc_bspsupp.h \ +include_bsp_HEADERS = ../../../libcpu/@RTEMS_CPU@/new-exceptions/bspsupport/vectors.h \ + ../../../libcpu/@RTEMS_CPU@/new-exceptions/bspsupport/ppc_exc_bspsupp.h \ ../../shared/include/irq-generic.h \ include/irq-config.h \ include/irq.h \ @@ -122,14 +120,14 @@ libbsp_a_SOURCES = $(clock_SOURCES) $(console_SOURCES) $(i2c_SOURCES) \ $(ide_SOURCES) $(irq_SOURCES) $(mscan_SOURCES) $(nvram_SOURCES) \ $(slicetimer_SOURCES) $(tod_SOURCES) $(startup_SOURCES) $(bestcomm_SOURCES) -libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \ - $(libcpudir)/shared/cache.rel \ - $(libcpudir)/shared/stack.rel \ - $(libcpudir)/@exceptions@/rtems-cpu.rel \ - $(libcpudir)/@exceptions@/raw_exception.rel \ - $(libcpudir)/@exceptions@/exc_bspsupport.rel \ - $(libcpudir)/mpc6xx/mmu.rel \ - $(libcpudir)/mpc6xx/timer.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog index d5c3db6a99..7a6cf2b0c6 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog @@ -1,3 +1,7 @@ +2008-09-24 Ralf Corsépius + + * Makefile.am: Eliminates libcpudir. + 2008-09-19 Thomas Doerfler * startup/bspstart.c: correct bsp_clicks_per_usec initialization diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index a43209729f..3754a7d9e3 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am @@ -12,8 +12,6 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h -libcpudir = ../../../libcpu/@RTEMS_CPU@ - nodist_include_HEADERS = include/bspopts.h DISTCLEANFILES = include/bspopts.h @@ -89,20 +87,20 @@ libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ $(irq_SOURCES) $(mpc83xx_regs_SOURCES) \ $(bsp_i2c_SOURCES) $(bsp_spi_SOURCES) -libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \ - $(libcpudir)/shared/cache.rel \ - $(libcpudir)/@exceptions@/rtems-cpu.rel \ - $(libcpudir)/@exceptions@/raw_exception.rel \ - $(libcpudir)/@exceptions@/exc_bspsupport.rel \ - $(libcpudir)/mpc6xx/mmu.rel \ - $(libcpudir)/mpc6xx/timer.rel \ - $(libcpudir)/mpc83xx/i2c.rel \ - $(libcpudir)/mpc83xx/spi.rel \ - $(libcpudir)/mpc83xx/gtm.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc83xx/i2c.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc83xx/spi.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc83xx/gtm.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel -libbsp_a_LIBADD += $(libcpudir)/mpc83xx/tsec.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mpc83xx/tsec.rel endif EXTRA_DIST += README.mpc8349eamds diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog index e08c48b04d..4ee3bf3997 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog @@ -1,3 +1,7 @@ +2008-09-24 Ralf Corsépius + + * Makefile.am: Eliminates libcpudir. + 2008-08-30 Joel Sherrill * Makefile.am, startup/bspstart.c: Use default bsp_pretasking_hook(). diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index ccd5213efd..170ae99f6c 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -7,8 +7,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -libcpudir = ../../../libcpu/@RTEMS_CPU@ - DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -64,17 +62,17 @@ noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(irq_generic_SOURCES) \ $(tests_SOURCES) -libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \ - $(libcpudir)/shared/cache.rel \ - $(libcpudir)/shared/stack.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/misc.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/irq.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/edma.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/dspi.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/esci.rel \ - $(libcpudir)/@exceptions@/rtems-cpu.rel \ - $(libcpudir)/@exceptions@/raw_exception.rel \ - $(libcpudir)/@exceptions@/exc_bspsupport.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/misc.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/edma.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dspi.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/esci.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog index 9e43839569..d149bb5193 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog @@ -1,3 +1,7 @@ +2008-09-24 Ralf Corsépius + + * Makefile.am: Eliminates libcpudir. + 2008-09-23 Thomas Doerfler * startup/cpuinit.c, startup/bspstart.c: initialize mmu, make sure diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am index 08489adc8d..40eb587693 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am @@ -12,8 +12,6 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h -libcpudir = ../../../libcpu/@RTEMS_CPU@ - nodist_include_HEADERS = include/bspopts.h DISTCLEANFILES = include/bspopts.h @@ -25,9 +23,8 @@ include_HEADERS += include/coverhd.h include_bsp_HEADERS = include/tqm.h include/8xx_immap.h \ include/irq.h include/irq-config.h \ ../../shared/include/irq-generic.h\ - $(libcpudir)/@exceptions@/bspsupport/vectors.h \ - $(libcpudir)/@exceptions@/bspsupport/ppc_exc_bspsupp.h - + ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h EXTRA_DIST = times-tqm866 @@ -74,16 +71,16 @@ libbsp_a_SOURCES = $(irq_SOURCES) \ $(p_clock_SOURCES) $(timer_SOURCES) libbsp_a_LIBADD = \ - $(libcpudir)/shared/cpuIdent.rel \ - $(libcpudir)/shared/cache.rel \ - $(libcpudir)/@exceptions@/rtems-cpu.rel \ - $(libcpudir)/@exceptions@/raw_exception.rel \ - $(libcpudir)/@exceptions@/exc_bspsupport.rel \ - $(libcpudir)/mpc8xx/console-generic.rel \ - $(libcpudir)/mpc8xx/cpm.rel \ - $(libcpudir)/mpc8xx/clock.rel \ - $(libcpudir)/mpc8xx/mmu.rel \ - $(libcpudir)/mpc8xx/timer.rel + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ + ../../../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 \ + ../../../libcpu/@RTEMS_CPU@/mpc8xx/timer.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel -- cgit v1.2.3