esp32/wifi: use wapis init config to save Wi-Fi data

Instead of using Espressif's emulated NVS to save Wi-Fi data, use
`wapi`s wireless configure initialization mechanism for saving
Wi-Fi data. It 1) avoids creating a specific storage partition
just to save Wi-Fi data (ESP32's storage partition is used
instead); 2) avoids initialization problems of the emulated NVS
when SMP is enabled (the Wi-Fi driver tries to initialize it before
the actual partition is initialized); and 3) enables reconnecting
using `wapi reconnect` command and connect the device automatically
on bringup if `CONFIG_NETUTILS_NETINIT` is selected.

arch/xtensa/src/esp32/Kconfig

@@ -2061,50 +2061,6 @@ config ESP32_WIFI_SCAN_RESULT_SIZE
 	---help---
 		Maximum scan result buffer size.
 
-config ESP32_WIFI_SAVE_PARAM
-	bool "Save Wi-Fi Parameters"
-	default n
-	depends on ESP32_SPIFLASH
-	---help---
-		If you enable this option, Wi-Fi adapter parameters will be saved
-		into the file system instead of computing them each time.
-
-		These parameters mainly contains:
-			- SSID
-			- Password
-			- BSSID
-			- PMK(compute when connecting)
-			- Author mode
-			- MAC address
-			- Wi-Fi hardware configuration parameters
-
-config ESP32_WIFI_FS_MOUNTPT
-	string "Wi-Fi parameters mount point"
-	default "/mnt/esp/wifi"
-	depends on ESP32_WIFI_SAVE_PARAM
-	---help---
-		Mount point of Wi-Fi storage file system.
-
-config ESP32_WIFI_MTD_ENCRYPT
-	bool "Encrypt Wi-Fi MTD partition"
-	default y
-	depends on ESP32_SECURE_FLASH_ENC_ENABLED
-
-config ESP32_WIFI_MTD_OFFSET
-	hex "Wi-Fi MTD partition offset"
-	default 0x280000 if !ESP32_HAVE_OTA_PARTITION
-	default 0x350000 if ESP32_HAVE_OTA_PARTITION
-	depends on ESP32_WIFI_SAVE_PARAM
-	---help---
-		This is the base address of the Wi-Fi MTD partition.
-
-config ESP32_WIFI_MTD_SIZE
-	hex "Wi-Fi MTD partition size"
-	default 0xb0000
-	depends on ESP32_WIFI_SAVE_PARAM
-	---help---
-		This is the size of the Wi-Fi MTD partition.
-
 config ESP32_WIFI_STA_DISCONNECT_PM
 	bool "Power Management for station when disconnected"
 	default n

arch/xtensa/src/esp32/esp32_wifi_adapter.c

@@ -81,12 +81,6 @@
 
 #define PHY_RF_MASK   ((1 << PHY_BT_MODULE) | (1 << PHY_WIFI_MODULE))
 
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-#  define NVS_FS_PREFIX CONFIG_ESP32_WIFI_FS_MOUNTPT
-#  define NVS_DIR_BASE  NVS_FS_PREFIX"/wifi."
-#  define NVS_FILE_MODE 0777
-#endif
-
 #define WIFI_CONNECT_TIMEOUT  CONFIG_ESP32_WIFI_CONNECT_TIMEOUT
 
 #define TIMER_INITIALIZED_VAL (0x5aa5a55a)
@@ -2844,13 +2838,9 @@ static int32_t esp_nvs_set_i8(uint32_t handle,
                               const char *key,
                               int8_t value)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  return esp_nvs_set_blob(handle, key, &value, sizeof(int8_t));
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -2873,15 +2863,9 @@ static int32_t esp_nvs_get_i8(uint32_t handle,
                               const char *key,
                               int8_t *out_value)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  size_t len = sizeof(int8_t);
-
-  return esp_nvs_get_blob(handle, key, out_value, &len);
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -2904,13 +2888,9 @@ static int32_t esp_nvs_set_u8(uint32_t handle,
                               const char *key,
                               uint8_t value)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  return esp_nvs_set_blob(handle, key, &value, sizeof(uint8_t));
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -2933,15 +2913,9 @@ static int32_t esp_nvs_get_u8(uint32_t handle,
                               const char *key,
                               uint8_t *out_value)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  size_t len = sizeof(uint8_t);
-
-  return esp_nvs_get_blob(handle, key, out_value, &len);
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -2964,13 +2938,9 @@ static int32_t esp_nvs_set_u16(uint32_t handle,
                                const char *key,
                                uint16_t value)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  return esp_nvs_set_blob(handle, key, &value, sizeof(uint16_t));
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -2993,15 +2963,9 @@ static int32_t esp_nvs_get_u16(uint32_t handle,
                                const char *key,
                                uint16_t *out_value)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  size_t len = sizeof(uint16_t);
-
-  return esp_nvs_get_blob(handle, key, out_value, &len);
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -3024,37 +2988,9 @@ static int32_t esp_nvs_open(const char *name,
                             uint32_t open_mode,
                             uint32_t *out_handle)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  int ret;
-  struct nvs_adpt *nvs_adpt;
-  int tmp;
-  char *index_name;
-
-  tmp = sizeof(struct nvs_adpt);
-  nvs_adpt = kmm_malloc(tmp);
-  if (!nvs_adpt)
-    {
-      wlerr("Failed to alloc %d memory\n", tmp);
-      return -1;
-    }
-
-  ret = asprintf(&index_name, "%s", name);
-  if (ret < 0)
-    {
-      wlerr("Failed to create NVS index_name string\n");
-      kmm_free(nvs_adpt);
-      return -1;
-    }
-
-  nvs_adpt->index_name = index_name;
-  *out_handle = (uint32_t)nvs_adpt;
-
-  return 0;
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -3073,14 +3009,7 @@ static int32_t esp_nvs_open(const char *name,
 
 static void esp_nvs_close(uint32_t handle)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  struct nvs_adpt *nvs_adpt = (struct nvs_adpt *)handle;
-
-  lib_free(nvs_adpt->index_name);
-  kmm_free(nvs_adpt);
-#else
   DEBUGPANIC();
-#endif
 }
 
 /****************************************************************************
@@ -3118,57 +3047,9 @@ static int32_t esp_nvs_set_blob(uint32_t handle,
                                 const void *value,
                                 size_t length)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  struct file file;
-  int ret;
-  char *dir;
-  struct nvs_adpt *nvs_adpt = (struct nvs_adpt *)handle;
-  char *index_name = nvs_adpt->index_name;
-
-  ret = asprintf(&dir, NVS_DIR_BASE"%s.%s", index_name, key);
-  if (ret < 0)
-    {
-      wlerr("Failed to create NVS dir string\n");
-      return -1;
-    }
-
-  ret = nx_unlink(dir);
-  if (ret)
-    {
-      if (ret != -ENOENT)
-        {
-          wlerr("Failed to unlink %s error=%d\n", dir, ret);
-          lib_free(dir);
-          return -1;
-        }
-    }
-
-  ret = file_open(&file, dir, O_WRONLY | O_CREAT, NVS_FILE_MODE);
-  if (ret < 0)
-    {
-      wlerr("Failed to set open %s\n", dir);
-      lib_free(dir);
-      return -1;
-    }
-
-  ret = file_write(&file, value, length);
-  if (ret < 0)
-    {
-      wlerr("Failed to write to %s\n", dir);
-      lib_free(dir);
-      file_close(&file);
-      return -1;
-    }
-
-  lib_free(dir);
-  file_close(&file);
-
-  return 0;
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -3193,56 +3074,9 @@ static int32_t esp_nvs_get_blob(uint32_t handle,
                                 void *out_value,
                                 size_t *length)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  struct file file;
-  int ret;
-  char *dir;
-  struct nvs_adpt *nvs_adpt = (struct nvs_adpt *)handle;
-  char *index_name = nvs_adpt->index_name;
-
-  ret = asprintf(&dir, NVS_DIR_BASE"%s.%s", index_name, key);
-  if (ret < 0)
-    {
-      wlerr("Failed to create NVS dir string\n");
-      return -1;
-    }
-
-  ret = file_open(&file, dir, O_RDONLY);
-  if (ret < 0)
-    {
-      if (ret == -ENOENT)
-        {
-          wlinfo("No file %s\n", dir);
-          lib_free(dir);
-          return ESP_ERR_NVS_NOT_FOUND;
-        }
-      wlerr("Failed to get open %s\n", dir);
-      lib_free(dir);
-      return -1;
-    }
-
-  ret = file_read(&file, out_value, *length);
-  if (ret <= 0)
-    {
-      wlerr("Failed to write to %s\n", dir);
-      lib_free(dir);
-      file_close(&file);
-      return -1;
-    }
-  else
-    {
-      *length = ret;
-    }
-
-  lib_free(dir);
-  file_close(&file);
-
-  return 0;
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -3262,35 +3096,9 @@ static int32_t esp_nvs_get_blob(uint32_t handle,
 
 static int32_t esp_nvs_erase_key(uint32_t handle, const char *key)
 {
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  int ret;
-  char *dir;
-  struct nvs_adpt *nvs_adpt = (struct nvs_adpt *)handle;
-  char *index_name = nvs_adpt->index_name;
-
-  ret = asprintf(&dir, NVS_DIR_BASE"%s.%s", index_name, key);
-  if (ret < 0)
-    {
-      wlerr("Failed to create NVS dir string\n");
-      return -1;
-    }
-
-  ret = nx_unlink(dir);
-  if (ret < 0)
-    {
-      wlerr("Failed to delete NVS file %s\n", dir);
-      lib_free(dir);
-      return -1;
-    }
-
-  lib_free(dir);
-
-  return 0;
-#else
   DEBUGPANIC();
 
   return -1;
-#endif
 }
 
 /****************************************************************************
@@ -4778,11 +4586,7 @@ int esp_wifi_adapter_init(void)
 
   sq_init(&g_wifi_evt_queue);
 
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  wifi_cfg.nvs_enable = 1;
-#else
   wifi_cfg.nvs_enable = 0;
-#endif
 
 #ifdef CONFIG_ESP32_WIFI_TX_AMPDU
   wifi_cfg.ampdu_tx_enable = 1;
@@ -5089,17 +4893,17 @@ int esp_wifi_sta_password(struct iwreq *iwr, bool set)
   DEBUGASSERT(ext != NULL);
 
   pdata = ext->key;
-  len   = ext->key_len;
-
-  if (set && len > PWD_MAX_LEN)
-    {
-      return -EINVAL;
-    }
 
   wifi_cfg = g_sta_wifi_cfg;
 
   if (set)
     {
+      len = ext->key_len;
+      if (len > PWD_MAX_LEN)
+        {
+          return -EINVAL;
+        }
+
       memset(wifi_cfg.sta.password, 0x0, PWD_MAX_LEN);
 
       if (ext->alg != IW_ENCODE_ALG_NONE)
@@ -5138,6 +4942,7 @@ int esp_wifi_sta_password(struct iwreq *iwr, bool set)
     }
   else
     {
+      len = iwr->u.encoding.length - sizeof(*ext);
       size = strnlen((char *)wifi_cfg.sta.password, PWD_MAX_LEN);
       if (len < size)
         {
@@ -5145,8 +4950,8 @@ int esp_wifi_sta_password(struct iwreq *iwr, bool set)
         }
       else
         {
-          len = size;
-          memcpy(pdata, wifi_cfg.sta.password, len);
+          ext->key_len = size;
+          memcpy(pdata, wifi_cfg.sta.password, ext->key_len);
         }
 
       if (g_sta_connected)

boards/xtensa/esp32/common/src/esp32_board_spiflash.c

@@ -57,12 +57,6 @@
 #  define OTA_ENCRYPT false
 #endif
 
-#ifdef CONFIG_ESP32_WIFI_MTD_ENCRYPT
-#  define WIFI_ENCRYPT true
-#else
-#  define WIFI_ENCRYPT false
-#endif
-
 #ifdef CONFIG_ESP32_STORAGE_MTD_ENCRYPT
 #  define STORAGE_ENCRYPT true
 #else
@@ -351,72 +345,6 @@ static int setup_nxffs(struct mtd_dev_s *mtd, const char *mnt_pt)
 }
 #endif
 
-/****************************************************************************
- * Name: init_wifi_partition
- *
- * Description:
- *   Initialize partition that is dedicated to Wi-Fi.
- *
- * Returned Value:
- *   Zero on success; a negated errno value on failure.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-static int init_wifi_partition(void)
-{
-  int ret = OK;
-  struct mtd_dev_s *mtd;
-
-  mtd = esp32_spiflash_alloc_mtdpart(CONFIG_ESP32_WIFI_MTD_OFFSET,
-                                     CONFIG_ESP32_WIFI_MTD_SIZE,
-                                     WIFI_ENCRYPT);
-  if (!mtd)
-    {
-      ferr("ERROR: Failed to alloc MTD partition of SPI Flash\n");
-      return -ENOMEM;
-    }
-
-#ifdef CONFIG_ESP32_SPIFLASH_SMARTFS
-
-  ret = setup_smartfs(1, mtd, CONFIG_ESP32_WIFI_FS_MOUNTPT);
-  if (ret < 0)
-    {
-      ferr("ERROR: Failed to setup smartfs\n");
-      return ret;
-    }
-
-#elif defined(CONFIG_ESP32_SPIFLASH_LITTLEFS)
-
-  const char *path = "/dev/mtdblock1";
-  ret = setup_littlefs(path, mtd, CONFIG_ESP32_WIFI_FS_MOUNTPT, 0777);
-  if (ret < 0)
-    {
-      ferr("ERROR: Failed to setup littlefs\n");
-      return ret;
-    }
-
-#elif defined(CONFIG_ESP32_SPIFLASH_SPIFFS)
-
-  const char *path = "/dev/mtdblock1";
-  ret = setup_spiffs(path, mtd, CONFIG_ESP32_WIFI_FS_MOUNTPT, 0777);
-  if (ret < 0)
-    {
-      ferr("ERROR: Failed to setup spiffs\n");
-      return ret;
-    }
-
-#else
-
-    ferr("ERROR: No supported FS selected. Wi-Fi partition "
-         "should be mounted before Wi-Fi initialization\n");
-
-#endif
-
-  return ret;
-}
-#endif
-
 /****************************************************************************
  * Name: init_storage_partition
  *
@@ -444,7 +372,7 @@ static int init_storage_partition(void)
 
 #ifdef CONFIG_ESP32_SPIFLASH_SMARTFS
 
-  ret = setup_smartfs(0, mtd, NULL);
+  ret = setup_smartfs(0, mtd, "/data");
   if (ret < 0)
     {
       ferr("ERROR: Failed to setup smartfs\n");
@@ -453,7 +381,7 @@ static int init_storage_partition(void)
 
 #elif defined(CONFIG_ESP32_SPIFLASH_NXFFS)
 
-  ret = setup_nxffs(mtd, "/mnt");
+  ret = setup_nxffs(mtd, "/data");
   if (ret < 0)
     {
       ferr("ERROR: Failed to setup nxffs\n");
@@ -463,7 +391,7 @@ static int init_storage_partition(void)
 #elif defined(CONFIG_ESP32_SPIFLASH_LITTLEFS)
 
   const char *path = "/dev/esp32flash";
-  ret = setup_littlefs(path, mtd, NULL, 0755);
+  ret = setup_littlefs(path, mtd, "/data", 0755);
   if (ret < 0)
     {
       ferr("ERROR: Failed to setup littlefs\n");
@@ -473,7 +401,7 @@ static int init_storage_partition(void)
 #elif defined(CONFIG_ESP32_SPIFLASH_SPIFFS)
 
   const char *path = "/dev/esp32flash";
-  ret = setup_spiffs(path, mtd, NULL, 0755);
+  ret = setup_spiffs(path, mtd, "/data", 0755);
   if (ret < 0)
     {
       ferr("ERROR: Failed to setup spiffs\n");
@@ -525,14 +453,6 @@ int esp32_spiflash_init(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32_WIFI_SAVE_PARAM
-  ret = init_wifi_partition();
-  if (ret < 0)
-    {
-      return ret;
-    }
-#endif
-
   ret = init_storage_partition();
   if (ret < 0)
     {

boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig

@@ -54,7 +54,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLES_I2SCHAR=y
 CONFIG_EXAMPLES_I2SCHAR_TX=y
 CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS=2
@@ -74,6 +73,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
@@ -117,3 +117,4 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-audio-kit/configs/wifi/defconfig

@@ -34,7 +34,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INIT_ENTRYPOINT="nsh_main"
@@ -46,6 +45,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
@@ -87,3 +87,4 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig

@@ -54,7 +54,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLES_I2SCHAR=y
 CONFIG_EXAMPLES_I2SCHAR_TX=y
 CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS=2
@@ -77,6 +76,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
@@ -122,3 +122,4 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig

@@ -28,7 +28,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
@@ -44,6 +43,7 @@ CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NET_BROADCAST=y
 CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_SOCKET=y
@@ -73,4 +73,5 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
 CONFIG_WIRELESS_WAPI_STACKSIZE=4096

boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig

@@ -85,7 +85,6 @@ CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
 CONFIG_ESP32_WIFI_BT_COEXIST=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
 CONFIG_FILE_STREAM=y
 CONFIG_FS_PROCFS=y
@@ -105,6 +104,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BLUETOOTH=y
@@ -148,3 +148,4 @@ CONFIG_WIRELESS=y
 CONFIG_WIRELESS_BLUETOOTH=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-devkitc/configs/efuse/defconfig

@@ -45,9 +45,7 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_FS_PROCFS=y
-CONFIG_HOST_MACOS=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INTELHEX_BINARY=y
@@ -58,6 +56,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
@@ -99,3 +98,4 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig

@@ -51,7 +51,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLES_I2SCHAR=y
 CONFIG_EXAMPLES_I2SCHAR_BUFSIZE=960
 CONFIG_EXAMPLES_I2SCHAR_RX=y
@@ -78,6 +77,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
@@ -124,3 +124,4 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig

@@ -9,7 +9,6 @@
 # CONFIG_NDEBUG is not set
 # CONFIG_NSH_ARGCAT is not set
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
-# CONFIG_NSH_NETINIT is not set
 CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="xtensa"
 CONFIG_ARCH_BOARD="esp32-devkitc"
@@ -20,6 +19,7 @@ CONFIG_ARCH_CHIP_ESP32=y
 CONFIG_ARCH_CHIP_ESP32WROVER=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_XTENSA=y
+CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BUILTIN=y
 CONFIG_DRIVERS_IEEE80211=y
@@ -29,7 +29,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIFI_STATION_SOFTAP=y
 CONFIG_EXAMPLES_DHCPD=y
 CONFIG_EXPERIMENTAL=y
@@ -45,6 +44,7 @@ CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_DHCPD=y
 CONFIG_NET_BROADCAST=y
 CONFIG_NET_ETH_PKTSIZE=1514
@@ -76,4 +76,5 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
 CONFIG_WIRELESS_WAPI_STACKSIZE=4096

boards/xtensa/esp32/esp32-devkitc/configs/wifi/defconfig

@@ -31,7 +31,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INIT_ENTRYPOINT="nsh_main"
@@ -43,6 +42,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
@@ -82,3 +82,4 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-devkitc/configs/wifi_smp/defconfig

@@ -35,7 +35,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_WEBSERVER=y
 CONFIG_FS_PROCFS=y
@@ -53,6 +52,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_CODECS=y
 CONFIG_NETUTILS_HTTPD_DIRLIST=y
 CONFIG_NETUTILS_HTTPD_SENDFILE=y
@@ -112,4 +112,5 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
 CONFIG_WIRELESS_WAPI_STACKSIZE=4096

boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig

@@ -28,7 +28,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
@@ -47,6 +46,7 @@ CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DRIPADDR=0xc0a80001
 CONFIG_NETINIT_WAPI_PASSPHRASE="YOUR_ROUTER_PASSWORD"
 CONFIG_NETINIT_WAPI_SSID="YOUR_ROUTER_NAME"
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
 CONFIG_NET_ETH_PKTSIZE=1518
@@ -82,4 +82,5 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
 CONFIG_WIRELESS_WAPI_STACKSIZE=4096

boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig

@@ -27,7 +27,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
@@ -43,6 +42,7 @@ CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NET_BROADCAST=y
 CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_SOCKET=y
@@ -72,4 +72,5 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
 CONFIG_WIRELESS_WAPI_STACKSIZE=4096

boards/xtensa/esp32/esp32-ethernet-kit/configs/wifi/defconfig

@@ -26,7 +26,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
@@ -40,6 +39,7 @@ CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NET_BROADCAST=y
 CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_SOCKET=y
@@ -71,4 +71,5 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
 CONFIG_WIRELESS_WAPI_STACKSIZE=4096

boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig

@@ -53,7 +53,6 @@ CONFIG_ESP32_SPIFLASH=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLES_I2SCHAR=y
 CONFIG_EXAMPLES_I2SCHAR_TX=y
 CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS=2
@@ -77,6 +76,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
@@ -121,3 +121,4 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-lyrat/configs/wifi/defconfig

@@ -34,7 +34,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INIT_ENTRYPOINT="nsh_main"
@@ -46,6 +45,7 @@ CONFIG_NETDB_DNSCLIENT_NAMESIZE=64
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NETUTILS_IPERF=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NET_BROADCAST=y
@@ -87,3 +87,4 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y

boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig

@@ -28,7 +28,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
@@ -44,6 +43,7 @@ CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NET_BROADCAST=y
 CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_SOCKET=y
@@ -73,4 +73,5 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
 CONFIG_WIRELESS_WAPI_STACKSIZE=4096

boards/xtensa/esp32/esp32-wrover-kit/configs/wifi/defconfig

@@ -27,7 +27,6 @@ CONFIG_ESP32_SPIFLASH_SPIFFS=y
 CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI=y
-CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
@@ -41,6 +40,7 @@ CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
 CONFIG_NET_BROADCAST=y
 CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_SOCKET=y
@@ -72,4 +72,5 @@ CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_WAPI=y
 CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
 CONFIG_WIRELESS_WAPI_STACKSIZE=4096