[incubator-nuttx-apps] branch master updated: Check CONFIG_BOARDCTL_ROMDISK is set

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new bff9221      Check CONFIG_BOARDCTL_ROMDISK is set
bff9221 is described below

commit bff92219cd45ed9c429f6251ba1f516456e3891e
Author: Tanushree Baindur <ta...@gmail.com>
AuthorDate: Wed May 19 18:42:28 2021 -0500

        Check CONFIG_BOARDCTL_ROMDISK is set
    
        CONFIG_BOARDCTL_ROMDISK must be set to enable boardctl(BOARDIOC_ROMDISK)
        in these 2 files:
        examples/nxflat/nxflat_main.c
        examples/thttpd/thttpd_main.c
---
 examples/nxflat/nxflat_main.c | 7 +++----
 examples/thttpd/thttpd_main.c | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/examples/nxflat/nxflat_main.c b/examples/nxflat/nxflat_main.c
index 791e60e..191c552 100644
--- a/examples/nxflat/nxflat_main.c
+++ b/examples/nxflat/nxflat_main.c
@@ -62,10 +62,6 @@
  * are required -- only the more obvious.
  */
 
-#ifdef CONFIG_BINFMT_DISABLE
-#  error "The binary loader is disabled (CONFIG_BINFMT_DISABLE)!"
-#endif
-
 #ifndef CONFIG_NXFLAT
 #  error "You must select CONFIG_NXFLAT in your configuration file"
 #endif
@@ -82,6 +78,9 @@
 #  error "You must not disable loadable modules via CONFIG_BINFMT_DISABLE in your configuration file"
 #endif
 
+#ifndef CONFIG_BOARDCTL_ROMDISK
+#  error "CONFIG_BOARDCTL_ROMDISK should be enabled in the configuration file"
+#endif
 /* Describe the ROMFS file system */
 
 #define SECTORSIZE   512
diff --git a/examples/thttpd/thttpd_main.c b/examples/thttpd/thttpd_main.c
index d350084..5d6a840 100644
--- a/examples/thttpd/thttpd_main.c
+++ b/examples/thttpd/thttpd_main.c
@@ -95,6 +95,10 @@
 #  ifdef CONFIG_DISABLE_MOUNTPOINT
 #    error "You must not disable mountpoints via CONFIG_DISABLE_MOUNTPOINT in your configuration file"
 #  endif
+
+#ifndef CONFIG_BOARDCTL_ROMDISK
+#  error "CONFIG_BOARDCTL_ROMDISK should be enabled in the configuration file"
+#endif
 #endif
 
 #ifdef CONFIG_THTTPD_BINFS