diff --git a/components/modules/bthci.c b/components/modules/bthci.c
index 5710eae7..3cad84b0 100644
--- a/components/modules/bthci.c
+++ b/components/modules/bthci.c
@@ -31,6 +31,9 @@
  * @author Johny Mattsson <jmattsson@dius.com.au>
  */
 
+#include "sdkconfig.h"
+#ifdef CONFIG_LUA_MODULE_BTHCI
+
 #include "module.h"
 #include "lauxlib.h"
 #include "task/task.h"
@@ -327,7 +330,8 @@ static int lbthci_init (lua_State *L)
   for (int i = 0; i < MAX_CMD_Q; ++i)
     cmd_q[i].cb_ref = LUA_NOREF;
 
-  esp_bt_controller_init ();
+  esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
+  esp_bt_controller_init (&bt_cfg);
 
   esp_vhci_host_register_callback (&bthci_callbacks);
 
@@ -573,3 +577,4 @@ static const LUA_REG_TYPE bthci_map[] =
 };
 
 NODEMCU_MODULE(BTHCI, "bthci", bthci_map, lbthci_init);
+#endif
diff --git a/components/platform/flash_api.c b/components/platform/flash_api.c
index b7a0b4ec..ff002270 100644
--- a/components/platform/flash_api.c
+++ b/components/platform/flash_api.c
@@ -29,8 +29,8 @@ static inline esp_image_header_t flash_load_rom_header (void)
 #define IRAM_SECTION __attribute__((section(".iram1")))
 static void IRAM_SECTION update_flash_chip_size (uint32_t sz)
 {
-  SPIParamCfg (
-    g_rom_flashchip.deviceId,
+  esp_rom_spiflash_config_param (
+    g_rom_flashchip.device_id,
     sz,
     g_rom_flashchip.block_size,
     g_rom_flashchip.sector_size,
diff --git a/sdk/esp32-esp-idf b/sdk/esp32-esp-idf
index ecbe5a66..9050307d 160000
--- a/sdk/esp32-esp-idf
+++ b/sdk/esp32-esp-idf
@@ -1 +1 @@
-Subproject commit ecbe5a66f2478879ea3ca4bd6d7cab92065604a9
+Subproject commit 9050307dfe600c915adaccf8076220d6474876db