Straighten out conditional compilation

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@1896 7fd9a85b-ad96-42d3-883c-3090e2eb8679

1 files changed, 13 insertions, 0 deletions

diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c
index 1486586dd4..b4afe7bf70 100644
--- a/nuttx/tools/mkconfig.c
+++ b/nuttx/tools/mkconfig.c
@@ -220,6 +220,19 @@ int main(int argc, char **argv, char **envp)
   printf("#if defined(__NXFLAT__) && !defined(CONFIG_NXFLAT)\n");
   printf("# error \"NXFLAT support not enabled in this configuration\"\n");
   printf("#endif\n\n");
+  printf("/* NXFLAT requires PIC support in the TCBs. */\n\n");
+  printf("#if defined(CONFIG_NXFLAT)\n");
+  printf("# undef CONFIG_PIC\n");
+  printf("# define CONFIG_PIC 1\n");
+  printf("#endif\n\n");
+  printf("/* Binary format support is disabled if no binary formats are\n");
+  printf(" * configured (at present, NXFLAT is the only supported binary.\n");
+  printf(" * format).\n");
+  printf(" */\n\n");
+  printf("#if !defined(CONFIG_NXFLAT)\n");
+  printf("# undef CONFIG_BINFMT_DISABLE\n");
+  printf("# define CONFIG_BINFMT_DISABLE 1\n");
+  printf("#endif\n\n");
   printf("/* The correct way to disable RR scheduling is to set the\n");
   printf(" * timeslice to zero.\n");
   printf(" */\n\n");