Support for the older, manual configurations has been completely removed from the NuttX build system

2 files changed, 2 insertions, 55 deletions

diff --git a/nuttx/tools/configure.c b/nuttx/tools/configure.c
index 323177b75..5f8fbdddc 100644
--- a/nuttx/tools/configure.c
+++ b/nuttx/tools/configure.c
@@ -87,11 +87,9 @@ static char       *g_verstring     = "0.0"; /* Version String */
 
 static char       *g_srcdefconfig  = NULL;  /* Source defconfig file */
 static char       *g_srcmakedefs   = NULL;  /* Source Make.defs file */
-static char       *g_srcappconfig  = NULL ; /* Source appconfig file (optional) */
 static char       *g_srcsetenvsh   = NULL;  /* Source setenv.sh file (optional) */
 static char       *g_srcsetenvbat  = NULL;  /* Source setenv.bat file (optional) */
 
-static bool        g_newconfig     = false; /* True: New style configuration */
 static bool        g_winnative     = false; /* True: Windows native configuration */
 static bool        g_needapppath   = true;  /* Need to add app path to the .config file */
 
@@ -603,15 +601,6 @@ static void check_configuration(void)
 {
   struct variable_s *var;
 
-  /* Check if this the new style configuration based on kconfig-fontends */
-
-  var = find_variable("CONFIG_NUTTX_NEWCONFIG", g_configvars);
-  if (var && var->val && strcmp("y", var->val) == 0)
-    {
-      debug("check_configuration: New style configuration\n");
-      g_newconfig = true;
-    }
-
   /* Check if this is a Windows native configuration */
 
   var = find_variable("CONFIG_WINDOWS_NATIVE", g_configvars);
@@ -669,23 +658,6 @@ static void check_configuration(void)
           g_srcsetenvsh = strdup(g_buffer);
         }
     }
-
-  /* Old style configurations MUST provide an appconfig file */
-
-  if (!g_newconfig)
-    {
-      snprintf(g_buffer, BUFFER_SIZE, "%s%cappconfig", g_configpath, g_delim);
-      debug("check_configuration: Checking %s\n", g_buffer);
-      if (!verify_file(g_buffer))
-        {
-          fprintf(stderr, "ERROR: Configuration corrupted in %s\n", g_configpath);
-          fprintf(stderr, "       Required appconfig file not found.\n");
-          enumerate_configs();
-          exit(EXIT_FAILURE);
-        }
-
-      g_srcappconfig = strdup(g_buffer);
-    }
 }
 
 static void copy_file(const char *srcpath, const char *destpath, mode_t mode)
@@ -803,15 +775,6 @@ static void configure(void)
       copy_file(g_srcsetenvbat, g_buffer, 0644);
     }
 
-  /* Copy the appconfig file to ../apps/.config if have one and need one */
-
-  if (g_srcappconfig)
-    {
-      snprintf(g_buffer, BUFFER_SIZE, "%s%c.config", g_apppath, g_delim);
-      debug("configure: Copying from %s to %s\n", g_srcappconfig, g_buffer);
-      copy_file(g_srcappconfig, g_buffer, 0644);
-    }
-
   /* If we did not use the CONFIG_APPS_DIR that was in the defconfig config file,
    * then append the correct application information to the tail of the .config
    * file
diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh
index 7b3a1bdc1..25f5afc15 100755
--- a/nuttx/tools/configure.sh
+++ b/nuttx/tools/configure.sh
@@ -133,15 +133,12 @@ if [ ! -r "${src_config}" ]; then
 fi
 
 # Extract values needed from the defconfig file.  We need:
-# (1) The CONFIG_NUTTX_NEWCONFIG setting to know if this is a "new" style
-#     configuration,
-# (2) The CONFIG_WINDOWS_NATIVE setting to know it this is target for a
+# (1) The CONFIG_WINDOWS_NATIVE setting to know it this is target for a
 #     native Windows (meaning that we want setenv.bat vs setenv.sh and we need
 #     to use backslashes in the CONFIG_APPS_DIR setting).
-# (3) The CONFIG_APPS_DIR setting to see if there is a configured location for the
+# (2) The CONFIG_APPS_DIR setting to see if there is a configured location for the
 #     application directory.  This can be overridden from the command line.
 
-newconfig=`grep CONFIG_NUTTX_NEWCONFIG= "${src_config}" | cut -d'=' -f2`
 winnative=`grep CONFIG_WINDOWS_NATIVE= "${src_config}" | cut -d'=' -f2`
 
 defappdir=y
@@ -218,16 +215,3 @@ if [ "X${defappdir}" = "Xy" ]; then
     echo "CONFIG_APPS_DIR=\"$posappdir\"" >> "${dest_config}"
   fi
 fi 
-
-# Copy appconfig file.  The appconfig file will be copied to ${appdir}/.config
-# if both (1) ${appdir} is defined and (2) we are not using the new configuration
-# (which does not require a .config file in the appsdir.
-
-if [ ! -z "${appdir}" -a "X${newconfig}" != "Xy" ]; then
-  if [ ! -r "${configpath}/appconfig" ]; then
-    echo "NOTE: No readable appconfig file found in ${configpath}"
-  else
-    install -m 644 "${configpath}/appconfig" "${TOPDIR}/${posappdir}/.config" || \
-      { echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; }
-  fi
-fi