summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-10-23 20:53:39 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-10-23 20:53:39 +0000
commitb5b97766f3af24e736bd8660916db3ccd3cd590a (patch)
treea743c7ee7dfd9e09d4b39923a1227497c20066aa
parent57448320e5356eeb01813b730c5646287afb5a71 (diff)
downloadnuttx-b5b97766f3af24e736bd8660916db3ccd3cd590a.tar.gz
nuttx-b5b97766f3af24e736bd8660916db3ccd3cd590a.tar.bz2
nuttx-b5b97766f3af24e736bd8660916db3ccd3cd590a.zip
Need write-able block drivers even if no write-able FS
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1070 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/drivers/usbdev/Make.defs5
-rw-r--r--nuttx/tools/mkconfig.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/nuttx/drivers/usbdev/Make.defs b/nuttx/drivers/usbdev/Make.defs
index 1a79570e4..1bd391fa9 100644
--- a/nuttx/drivers/usbdev/Make.defs
+++ b/nuttx/drivers/usbdev/Make.defs
@@ -37,6 +37,9 @@ USBDEV_ASRCS =
USBDEV_CSRCS =
ifeq ($(CONFIG_USBDEV),y)
-USBDEV_CSRCS += usbdev_serial.c usbdev_storage.c usbdev_trace.c
+ifeq ($(CONFIG_USBSER),y)
+USBDEV_CSRCS += usbdev_serial.c
+endif
+USBDEV_CSRCS += usbdev_trace.c
endif
diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c
index 695b45298..071f0588a 100644
--- a/nuttx/tools/mkconfig.c
+++ b/nuttx/tools/mkconfig.c
@@ -263,13 +263,13 @@ int main(int argc, char **argv, char **envp)
printf("# undef CONFIG_FS_FAT\n");
printf("# undef CONFIG_FS_ROMFS\n");
printf("#endif\n\n");
- printf("/* Check if any readable and writable filesystem is supported */\n\n");
+ printf("/* Check if any readable and writable filesystem (OR USB storage) is supported */\n\n");
printf("#undef CONFIG_FS_READABLE\n");
printf("#undef CONFIG_FS_WRITABLE\n");
- printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_FS_ROMFS)\n");
+ printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_FS_ROMFS) || defined(CONFIG_USBSTRG)\n");
printf("# define CONFIG_FS_READABLE 1\n");
printf("#endif\n\n");
- printf("#if defined(CONFIG_FS_FAT)\n");
+ printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_USBSTRG)\n");
printf("# define CONFIG_FS_WRITABLE 1\n");
printf("#endif\n\n");
printf("/* There can be no network support with no socket descriptors */\n\n");