diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2008-07-14 16:15:28 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2008-07-14 16:15:28 +0000 |
| commit | 574fb675105b77dfe9598915207f1f32790f905f (patch) | |
| tree | fce34dc59687abc02a692c650ec3c86f05259025 /c/src/libchip | |
| parent | added haleakala BSP contributed by Michael Hamel (diff) | |
| download | rtems-574fb675105b77dfe9598915207f1f32790f905f.tar.bz2 | |
updated gen83xx BSP
updated haleakala BSP
added MPC55xx BSP
Diffstat (limited to 'c/src/libchip')
| -rw-r--r-- | c/src/libchip/Makefile.am | 28 | ||||
| -rw-r--r-- | c/src/libchip/i2c/spi-sd-card.c | 7 | ||||
| -rw-r--r-- | c/src/libchip/preinstall.am | 4 |
3 files changed, 27 insertions, 12 deletions
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am index f8ebde8fba..685e7e769c 100644 --- a/c/src/libchip/Makefile.am +++ b/c/src/libchip/Makefile.am @@ -82,17 +82,29 @@ EXTRA_DIST += rtc/README.ds1643 rtc/README.icm7170 rtc/README.m48t08 \ # i2c if LIBCHIP -include_libchip_HEADERS += i2c/i2c-ds1621.h i2c/i2c-2b-eeprom.h \ - i2c/spi-memdrv.h \ - i2c/spi-flash-m25p40.h i2c/spi-fram-fm25l256.h + +include_libchip_HEADERS += i2c/i2c-ds1621.h \ + i2c/i2c-2b-eeprom.h \ + i2c/spi-memdrv.h \ + i2c/spi-flash-m25p40.h \ + i2c/spi-fram-fm25l256.h \ + i2c/spi-sd-card.h noinst_LIBRARIES += libi2cio.a + libi2cio_a_CPPFLAGS = $(AM_CPPFLAGS) -libi2cio_a_SOURCES = i2c/i2c-ds1621.c i2c/i2c-2b-eeprom.c \ - i2c/i2c-ds1621.h i2c/i2c-2b-eeprom.h \ - i2c/spi-memdrv.c i2c/spi-memdrv.h \ - i2c/spi-flash-m25p40.c i2c/spi-flash-m25p40.h \ - i2c/spi-fram-fm25l256.c i2c/spi-fram-fm25l256.h +libi2cio_a_SOURCES = i2c/i2c-ds1621.h \ + i2c/i2c-2b-eeprom.h \ + i2c/spi-memdrv.h \ + i2c/spi-flash-m25p40.h \ + i2c/spi-fram-fm25l256.h \ + i2c/i2c-ds1621.c \ + i2c/i2c-2b-eeprom.c \ + i2c/spi-memdrv.c \ + i2c/spi-flash-m25p40.c \ + i2c/spi-fram-fm25l256.c \ + i2c/spi-sd-card.c + endif # serial diff --git a/c/src/libchip/i2c/spi-sd-card.c b/c/src/libchip/i2c/spi-sd-card.c index e440cf295c..c8a8022e72 100644 --- a/c/src/libchip/i2c/spi-sd-card.c +++ b/c/src/libchip/i2c/spi-sd-card.c @@ -16,17 +16,16 @@ * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE. */ +#include <stdio.h> +#include <errno.h> + #include <rtems.h> #include <rtems/libi2c.h> #include <rtems/libio.h> #include <rtems/diskdevs.h> -#include <errno.h> - #include <libchip/spi-sd-card.h> -// #define DEBUG - #include <rtems/status-checks.h> /** diff --git a/c/src/libchip/preinstall.am b/c/src/libchip/preinstall.am index ab3f06ea1e..9ac831dec5 100644 --- a/c/src/libchip/preinstall.am +++ b/c/src/libchip/preinstall.am @@ -141,6 +141,10 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-flash-m25p40.h $(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h: i2c/spi-fram-fm25l256.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h + +$(PROJECT_INCLUDE)/libchip/spi-sd-card.h: i2c/spi-sd-card.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-sd-card.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-sd-card.h endif if LIBCHIP $(PROJECT_INCLUDE)/libchip/mc68681.h: serial/mc68681.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) |