Merge branch 'nimble/make_msys_1_configurable' into 'master'

NimBLE: Fix check for static random address & add MSYS_1 in menuconfig

Closes BT-522

See merge request espressif/esp-idf!7851

components/bt/host/nimble/Kconfig.in

@@ -216,6 +216,16 @@ config BT_NIMBLE_HCI_EVT_LO_BUF_COUNT
         low-priority event buffers, then an incoming advertising report will
         get dropped
 
+config BT_NIMBLE_MSYS1_BLOCK_COUNT
+    int "MSYS_1 Block Count"
+    depends on BT_NIMBLE_ENABLED
+    default 12
+    help
+        MSYS is a system level mbuf registry. For prepare write & prepare
+        responses MBUFs are allocated out of msys_1 pool. For NIMBLE_MESH
+        enabled cases, this block count is increased by 8 than user defined
+        count.
+
 config BT_NIMBLE_HS_FLOW_CTRL
     bool "Enable Host Flow control"
     depends on BT_NIMBLE_ENABLED

components/bt/host/nimble/nimble

@@ -1 +1 @@
-Subproject commit 666ef21d01ca5db489184c53e84cd131b3cc56fe
+Subproject commit d60a322f54cdad95f842b9fabb026615745da1a3

components/bt/host/nimble/port/include/esp_nimble_cfg.h

@@ -15,9 +15,9 @@
 /*** kernel/os */
 #ifndef MYNEWT_VAL_MSYS_1_BLOCK_COUNT
 #ifdef CONFIG_BT_NIMBLE_MESH
-#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (20)
+#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT + 8)
 #else
-#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (12)
+#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT
 #endif
 #endif