diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-22 22:02:44 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-22 22:02:44 +0000 |
| commit | bfe0e68fe759271533fe2a28f8bc7acde4711d4e (patch) | |
| tree | dbf9cc375dd8e28271ebc2243c75f526ab02e9d1 | |
| parent | fd5993e55bcdc2643cacecc8079d1c04e41e719f (diff) | |
| download | nuttx-bfe0e68fe759271533fe2a28f8bc7acde4711d4e.tar.gz nuttx-bfe0e68fe759271533fe2a28f8bc7acde4711d4e.tar.bz2 nuttx-bfe0e68fe759271533fe2a28f8bc7acde4711d4e.zip | |
Allow block drivers without mountpoint support
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1063 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/drivers/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/drivers/mmcsd/Make.defs | 6 | ||||
| -rw-r--r-- | nuttx/fs/Makefile | 7 |
3 files changed, 4 insertions, 11 deletions
diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile index 70f10d19d..df5c838f8 100644 --- a/nuttx/drivers/Makefile +++ b/nuttx/drivers/Makefile @@ -48,12 +48,10 @@ USBDEVDEPPATH = --dep-path usbdev CFLAGS += -I$(TOPDIR)/drivers/usbdev endif -ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y) include mmcsd/Make.defs ROOTDEPPATH = --dep-path . MMCSDDEPPATH = --dep-path mmcsd CFLAGS += -I$(TOPDIR)/drivers/mmcsd -endif ASRCS = $(NET_ASRCS) $(USBDEV_ASRCS) $(MMCSD_ASRCS) AOBJS = $(ASRCS:.S=$(OBJEXT)) diff --git a/nuttx/drivers/mmcsd/Make.defs b/nuttx/drivers/mmcsd/Make.defs index 459b317d6..50552b9f9 100644 --- a/nuttx/drivers/mmcsd/Make.defs +++ b/nuttx/drivers/mmcsd/Make.defs @@ -34,9 +34,5 @@ ############################################################################ MMCSD_ASRCS = -MMCSD_CSRCS = - -ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y) -MMCSD_CSRCS += mmcsd_spi.c mmcsd_debug.c -endif +MMCSD_CSRCS = mmcsd_spi.c mmcsd_debug.c diff --git a/nuttx/fs/Makefile b/nuttx/fs/Makefile index d47d1d24b..8ab6635ab 100644 --- a/nuttx/fs/Makefile +++ b/nuttx/fs/Makefile @@ -50,11 +50,10 @@ CSRCS += fs_open.c fs_close.c fs_read.c fs_write.c fs_ioctl.c fs_lseek.c \ fs_inode.c fs_inodefind.c fs_inodereserve.c fs_statfs.c \ fs_inoderemove.c fs_registerdriver.c fs_unregisterdriver.c \ fs_inodeaddref.c fs_inoderelease.c -ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y) CSRCS += fs_registerblockdriver.c fs_unregisterblockdriver.c \ - fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c \ - fs_mount.c fs_umount.c \ - fs_fsync.c fs_unlink.c fs_rename.c \ + fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c +ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y) +CSRCS += fs_mount.c fs_umount.c fs_fsync.c fs_unlink.c fs_rename.c \ fs_mkdir.c fs_rmdir.c include fat/Make.defs include romfs/Make.defs |