diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-26 21:28:06 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-26 21:28:06 +0000 |
| commit | 80c1577382326efe05e6250e8fa7bfe4d04ae802 (patch) | |
| tree | 399dd098d5ab209658b397e37fddc60a41440566 /cpukit/sapi/include/confdefs.h | |
| parent | 2010-07-26 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-80c1577382326efe05e6250e8fa7bfe4d04ae802.tar.bz2 | |
2010-07-26 Joel Sherrill <joel.sherrill@oarcorp.com>
* sapi/include/confdefs.h: Do not cover up user configuation mistakes
on filesystems -- cite them as errors.
Diffstat (limited to 'cpukit/sapi/include/confdefs.h')
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index b1206b0411..84471021b4 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -223,27 +223,27 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #endif /* - * If disabling the file system undef everything. If DEVFS as the base - * filesystem undefine all other filesystems because you cannot mount other - * filesystems. Same for miniIMFS. + * If disabling the file system, give a compile error if the user has + * configured other filesystem parameters. */ - #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) || \ - defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \ - defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM) - #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) - #undef CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM - #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM - #elif defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) - #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM - #endif - #undef CONFIGURE_FILESYSTEM_MINIIMFS - #undef CONFIGURE_FILESYSTEM_IMFS - #undef CONFIGURE_FILESYSTEM_DEVFS - #undef CONFIGURE_FILESYSTEM_TFTPFS - #undef CONFIGURE_FILESYSTEM_FTPFS - #undef CONFIGURE_FILESYSTEM_NFS - #undef CONFIGURE_FILESYSTEM_DOSFS - #undef CONFIGURE_FILESYSTEM_RFS + #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) + #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \ + defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM) + #error "Filesystem disabled but a base filesystem configured." + #endif + + #if defined(CONFIGURE_FILESYSTEM_MINIIMFS) || \ + defined(CONFIGURE_FILESYSTEM_IMFS) || \ + defined(CONFIGURE_FILESYSTEM_DEVFS) || \ + defined(CONFIGURE_FILESYSTEM_TFTPFS) || \ + defined(CONFIGURE_FILESYSTEM_FTPFS) || \ + defined(CONFIGURE_FILESYSTEM_NFS) || \ + defined(CONFIGURE_FILESYSTEM_DOSFS) || \ + defined(CONFIGURE_FILESYSTEM_RFS) + #error "Configured filessystems but root filesystem was not IMFS!" + #error "Filesystems coule be disabled, DEVFS is root, or" + #error " miniIMFS is root!" + #endif #endif /* |