From 7e15770cda0aed534ae2f8c1e6cdd7ac3f33e3ce Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 5 Dec 2007 15:49:38 +0000 Subject: 2007-12-05 Daniel Hellstrom * Makefile.am, preinstall.am: i2c should be on branch as well as CVS head. --- c/src/lib/libbsp/sparc/leon2/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/leon2/Makefile.am | 6 ++++++ c/src/lib/libbsp/sparc/leon2/preinstall.am | 3 +++ c/src/lib/libbsp/sparc/leon3/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/leon3/Makefile.am | 8 +++++++- c/src/lib/libbsp/sparc/leon3/preinstall.am | 3 +++ 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog index 721cb0ad5c..35c4118dd9 100644 --- a/c/src/lib/libbsp/sparc/leon2/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog @@ -1,3 +1,8 @@ +2007-12-05 Daniel Hellstrom + + * Makefile.am, preinstall.am: i2c should be on branch as well as CVS + head. + 2007-11-30 Daniel Hellstrom * rasta/rasta.c: LEON2 PCI RASTA driver. Changes RASTA PCI interrupt to diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 8dc30b1740..5a4c196f7e 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -114,6 +114,12 @@ uart_rel_SOURCES = ../../sparc/shared/uart/apbuart.c ../../sparc/shared/uart/apb uart_rel_CPPFLAGS = $(AM_CPPFLAGS) uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +# I2CMST +include_HEADERS += ../../sparc/shared/include/i2cmst.h +noinst_PROGRAMS += i2cmst.rel +i2cmst_rel_SOURCES = ../../sparc/shared/i2c/i2cmst.c +i2cmst_rel_CPPFLAGS = $(AM_CPPFLAGS) +i2cmst_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING noinst_PROGRAMS += leon_smc91111.rel diff --git a/c/src/lib/libbsp/sparc/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am index eb34a64633..2551218f43 100644 --- a/c/src/lib/libbsp/sparc/leon2/preinstall.am +++ b/c/src/lib/libbsp/sparc/leon2/preinstall.am @@ -132,3 +132,6 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds +$(PROJECT_INCLUDE)/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cmst.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cmst.h diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog index 0a9f90308f..d81ff950df 100644 --- a/c/src/lib/libbsp/sparc/leon3/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog @@ -1,3 +1,8 @@ +2007-12-05 Daniel Hellstrom + + * Makefile.am, preinstall.am: i2c should be on branch as well as CVS + head. + 2007-11-26 Joel Sherrill * shmsupp/getcfg.c: Fix spacing. diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index 175344f030..917d83856b 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -104,6 +104,12 @@ uart_rel_SOURCES = ../../sparc/shared/uart/apbuart.c ../../sparc/shared/uart/apb uart_rel_CPPFLAGS = $(AM_CPPFLAGS) uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +# I2CMST +include_HEADERS += ../../sparc/shared/include/i2cmst.h +noinst_PROGRAMS += i2cmst.rel +i2cmst_rel_SOURCES = ../../sparc/shared/i2c/i2cmst.c +i2cmst_rel_CPPFLAGS = $(AM_CPPFLAGS) +i2cmst_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING noinst_PROGRAMS += leon_smc91111.rel @@ -137,7 +143,7 @@ endif noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = libbsp_a_LIBADD = startup.rel amba.rel console.rel clock.rel debugio.rel \ - timer.rel gnatsupp.rel brm.rel can.rel spw.rel uart.rel pci.rel + timer.rel gnatsupp.rel brm.rel can.rel spw.rel uart.rel pci.rel i2cmst.rel if HAS_NETWORKING libbsp_a_LIBADD += leon_open_eth.rel diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am index 96e3911490..00f0a8bd74 100644 --- a/c/src/lib/libbsp/sparc/leon3/preinstall.am +++ b/c/src/lib/libbsp/sparc/leon3/preinstall.am @@ -112,3 +112,6 @@ $(PROJECT_INCLUDE)/apbuart_pci.h: ../../sparc/shared/include/apbuart_pci.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart_pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart_pci.h +$(PROJECT_INCLUDE)/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cmst.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cmst.h -- cgit v1.2.3