Bump idf version

Author: Boon

platform.txt

@@ -28,6 +28,10 @@
 MIN_PARTITION_SUBTYPE_APP_OTA = 0x10
 NUM_PARTITION_SUBTYPE_APP_OTA = 16
 
+SECURE_NONE = None
+SECURE_V1 = 'v1'
+SECURE_V2 = 'v2'
+
 __version__ = '1.2'
 
 APP_TYPE = 0x00
@@ -91,13 +95,26 @@ def get_subtype_as_int(ptype, subtype):
 STRICT_DATA_ALIGNMENT = 0x1000
 
 
-def get_alignment_for_type(ptype):
+def get_alignment_offset_for_type(ptype):
     return ALIGNMENT.get(ptype, ALIGNMENT[DATA_TYPE])
 
 
+def get_alignment_size_for_type(ptype):
+    if ptype == APP_TYPE and secure == SECURE_V1:
+        # For secure boot v1 case, app partition must be 64K aligned
+        # signature block (68 bytes) lies at the very end of 64K block
+        return 0x10000
+    if ptype == APP_TYPE and secure == SECURE_V2:
+        # For secure boot v2 case, app partition must be 4K aligned
+        # signature block (4K) is kept after padding the unsigned image to 64K boundary
+        return 0x1000
+    # No specific size alignement requirement as such
+    return 0x1
+
+
 quiet = False
 md5sum = True
-secure = False
+secure = SECURE_NONE
 offset_part_table = 0
 
 
@@ -164,7 +181,7 @@ def expand_vars(f):
                     raise InputError('CSV Error: Partitions overlap. Partition at line %d sets offset 0x%x. Previous partition ends 0x%x'
                                      % (e.line_no, e.offset, last_end))
             if e.offset is None:
-                pad_to = get_alignment_for_type(e.type)
+                pad_to = get_alignment_offset_for_type(e.type)
                 if last_end % pad_to != 0:
                     last_end += pad_to - (last_end % pad_to)
                 e.offset = last_end
@@ -397,18 +414,20 @@ def verify(self):
             raise ValidationError(self, 'Subtype field is not set')
         if self.offset is None:
             raise ValidationError(self, 'Offset field is not set')
-        align = get_alignment_for_type(self.type)
-        if self.offset % align:
-            raise ValidationError(self, 'Offset 0x%x is not aligned to 0x%x' % (self.offset, align))
+        if self.size is None:
+            raise ValidationError(self, 'Size field is not set')
+        offset_align = get_alignment_offset_for_type(self.type)
+        if self.offset % offset_align:
+            raise ValidationError(self, 'Offset 0x%x is not aligned to 0x%x' % (self.offset, offset_align))
         # The alignment requirement for non-app partition is 4 bytes, but it should be 4 kB.
         # Print a warning for now, make it an error in IDF 5.0 (IDF-3742).
         if self.type != APP_TYPE and self.offset % STRICT_DATA_ALIGNMENT:
             critical('WARNING: Partition %s not aligned to 0x%x.'
                      'This is deprecated and will be considered an error in the future release.' % (self.name, STRICT_DATA_ALIGNMENT))
-        if self.size % align and secure and self.type == APP_TYPE:
-            raise ValidationError(self, 'Size 0x%x is not aligned to 0x%x' % (self.size, align))
-        if self.size is None:
-            raise ValidationError(self, 'Size field is not set')
+        if self.type == APP_TYPE and secure is not SECURE_NONE:
+            size_align = get_alignment_size_for_type(self.type)
+            if self.size % size_align:
+                raise ValidationError(self, 'Size 0x%x is not aligned to 0x%x' % (self.size, size_align))
 
         if self.name in TYPES and TYPES.get(self.name, '') != self.type:
             critical("WARNING: Partition has name '%s' which is a partition type, but does not match this partition's "
@@ -513,7 +532,7 @@ def main():
                                                'enabled by default and this flag does nothing.', action='store_true')
     parser.add_argument('--quiet', '-q', help="Don't print non-critical status messages to stderr", action='store_true')
     parser.add_argument('--offset', '-o', help='Set offset partition table', default='0x8000')
-    parser.add_argument('--secure', help='Require app partitions to be suitable for secure boot', action='store_true')
+    parser.add_argument('--secure', help='Require app partitions to be suitable for secure boot', nargs='?', const=SECURE_V1, choices=[SECURE_V1, SECURE_V2])
     parser.add_argument('input', help='Path to CSV or binary file to parse.', type=argparse.FileType('rb'))
     parser.add_argument('output', help='Path to output converted binary or CSV file. Will use stdout if omitted.',
                         nargs='?', default='-')

tools/gen_esp32part.py

@@ -329,7 +329,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.4\\"'),
+        ("IDF_VER", '\\"v4.4.4-148-g4c2afac355\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32.py

@@ -135,6 +135,7 @@
 #define CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE 1
 #define CONFIG_BTDM_SCAN_DUPL_TYPE 0
 #define CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE 20
+#define CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD 0
 #define CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN 1
 #define CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE 100
 #define CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED 1
@@ -364,6 +365,7 @@
 #define CONFIG_ESP_COREDUMP_CHECK_BOOT 1
 #define CONFIG_ESP_COREDUMP_ENABLE 1
 #define CONFIG_ESP_COREDUMP_MAX_TASKS_NUM 64
+#define CONFIG_ESP_COREDUMP_STACK_SIZE 1024
 #define CONFIG_FATFS_CODEPAGE_850 1
 #define CONFIG_FATFS_CODEPAGE 850
 #define CONFIG_FATFS_LFN_STACK 1
@@ -725,6 +727,7 @@
 #define CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32 CONFIG_ESP_COREDUMP_CHECKSUM_CRC32
 #define CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF
 #define CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM CONFIG_ESP_COREDUMP_MAX_TASKS_NUM
+#define CONFIG_ESP32_CORE_DUMP_STACK_SIZE CONFIG_ESP_COREDUMP_STACK_SIZE
 #define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY
 #define CONFIG_ESP32_ENABLE_COREDUMP CONFIG_ESP_COREDUMP_ENABLE
 #define CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH
@@ -819,5 +822,5 @@
 #define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
 #define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
 #define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
-#define CONFIG_ARDUINO_IDF_COMMIT "e8bdaf9198"
-#define CONFIG_ARDUINO_IDF_BRANCH "v4.4.4"
+#define CONFIG_ARDUINO_IDF_COMMIT "4c2afac355"
+#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/bin/bootloader_dio_40m.elf

@@ -135,6 +135,7 @@
 #define CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE 1
 #define CONFIG_BTDM_SCAN_DUPL_TYPE 0
 #define CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE 20
+#define CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD 0
 #define CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN 1
 #define CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE 100
 #define CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED 1
@@ -364,6 +365,7 @@
 #define CONFIG_ESP_COREDUMP_CHECK_BOOT 1
 #define CONFIG_ESP_COREDUMP_ENABLE 1
 #define CONFIG_ESP_COREDUMP_MAX_TASKS_NUM 64
+#define CONFIG_ESP_COREDUMP_STACK_SIZE 1024
 #define CONFIG_FATFS_CODEPAGE_850 1
 #define CONFIG_FATFS_CODEPAGE 850
 #define CONFIG_FATFS_LFN_STACK 1
@@ -725,6 +727,7 @@
 #define CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32 CONFIG_ESP_COREDUMP_CHECKSUM_CRC32
 #define CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF
 #define CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM CONFIG_ESP_COREDUMP_MAX_TASKS_NUM
+#define CONFIG_ESP32_CORE_DUMP_STACK_SIZE CONFIG_ESP_COREDUMP_STACK_SIZE
 #define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY
 #define CONFIG_ESP32_ENABLE_COREDUMP CONFIG_ESP_COREDUMP_ENABLE
 #define CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH
@@ -819,5 +822,5 @@
 #define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
 #define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
 #define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
-#define CONFIG_ARDUINO_IDF_COMMIT "e8bdaf9198"
-#define CONFIG_ARDUINO_IDF_BRANCH "v4.4.4"
+#define CONFIG_ARDUINO_IDF_COMMIT "4c2afac355"
+#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/bin/bootloader_dio_80m.elf

@@ -27,6 +27,7 @@ extern "C" {
         return ESP_ERR_INVALID_STATE;                \
     }
 
+#define ESP_BT_STATUS_BASE_FOR_HCI_ERR  0X0100  /* base for coverting HCI error code to ESP status */
 
 /* relate to BT_STATUS_xxx in bt_def.h */
 /// Status Return Value
@@ -53,6 +54,71 @@ typedef enum {
     ESP_BT_STATUS_ERR_ILLEGAL_PARAMETER_FMT,    /* relate to HCI_ERR_ILLEGAL_PARAMETER_FMT in stack/hcidefs.h */
     ESP_BT_STATUS_MEMORY_FULL   = 20,           /* relate to BT_STATUS_MEMORY_FULL in bt_def.h */
     ESP_BT_STATUS_EIR_TOO_LARGE,                /* relate to BT_STATUS_EIR_TOO_LARGE in bt_def.h */
+    ESP_BT_STATUS_HCI_SUCCESS   = ESP_BT_STATUS_BASE_FOR_HCI_ERR,
+    ESP_BT_STATUS_HCI_PENDING,
+    ESP_BT_STATUS_HCI_ILLEGAL_COMMAND,
+    ESP_BT_STATUS_HCI_NO_CONNECTION,
+    ESP_BT_STATUS_HCI_HW_FAILURE,
+    ESP_BT_STATUS_HCI_PAGE_TIMEOUT,
+    ESP_BT_STATUS_HCI_AUTH_FAILURE,
+    ESP_BT_STATUS_HCI_KEY_MISSING,
+    ESP_BT_STATUS_HCI_MEMORY_FULL,
+    ESP_BT_STATUS_HCI_CONNECTION_TOUT,
+    ESP_BT_STATUS_HCI_MAX_NUM_OF_CONNECTIONS,
+    ESP_BT_STATUS_HCI_MAX_NUM_OF_SCOS,
+    ESP_BT_STATUS_HCI_CONNECTION_EXISTS,
+    ESP_BT_STATUS_HCI_COMMAND_DISALLOWED,
+    ESP_BT_STATUS_HCI_HOST_REJECT_RESOURCES,
+    ESP_BT_STATUS_HCI_HOST_REJECT_SECURITY,
+    ESP_BT_STATUS_HCI_HOST_REJECT_DEVICE,
+    ESP_BT_STATUS_HCI_HOST_TIMEOUT,
+    ESP_BT_STATUS_HCI_UNSUPPORTED_VALUE,
+    ESP_BT_STATUS_HCI_ILLEGAL_PARAMETER_FMT,
+    ESP_BT_STATUS_HCI_PEER_USER,
+    ESP_BT_STATUS_HCI_PEER_LOW_RESOURCES,
+    ESP_BT_STATUS_HCI_PEER_POWER_OFF,
+    ESP_BT_STATUS_HCI_CONN_CAUSE_LOCAL_HOST,
+    ESP_BT_STATUS_HCI_REPEATED_ATTEMPTS,
+    ESP_BT_STATUS_HCI_PAIRING_NOT_ALLOWED,
+    ESP_BT_STATUS_HCI_UNKNOWN_LMP_PDU,
+    ESP_BT_STATUS_HCI_UNSUPPORTED_REM_FEATURE,
+    ESP_BT_STATUS_HCI_SCO_OFFSET_REJECTED,
+    ESP_BT_STATUS_HCI_SCO_INTERVAL_REJECTED,
+    ESP_BT_STATUS_HCI_SCO_AIR_MODE,
+    ESP_BT_STATUS_HCI_INVALID_LMP_PARAM,
+    ESP_BT_STATUS_HCI_UNSPECIFIED,
+    ESP_BT_STATUS_HCI_UNSUPPORTED_LMP_PARAMETERS,
+    ESP_BT_STATUS_HCI_ROLE_CHANGE_NOT_ALLOWED,
+    ESP_BT_STATUS_HCI_LMP_RESPONSE_TIMEOUT,
+    ESP_BT_STATUS_HCI_LMP_ERR_TRANS_COLLISION,
+    ESP_BT_STATUS_HCI_LMP_PDU_NOT_ALLOWED,
+    ESP_BT_STATUS_HCI_ENCRY_MODE_NOT_ACCEPTABLE,
+    ESP_BT_STATUS_HCI_UNIT_KEY_USED,
+    ESP_BT_STATUS_HCI_QOS_NOT_SUPPORTED,
+    ESP_BT_STATUS_HCI_INSTANT_PASSED,
+    ESP_BT_STATUS_HCI_PAIRING_WITH_UNIT_KEY_NOT_SUPPORTED,
+    ESP_BT_STATUS_HCI_DIFF_TRANSACTION_COLLISION,
+    ESP_BT_STATUS_HCI_UNDEFINED_0x2B,
+    ESP_BT_STATUS_HCI_QOS_UNACCEPTABLE_PARAM,
+    ESP_BT_STATUS_HCI_QOS_REJECTED,
+    ESP_BT_STATUS_HCI_CHAN_CLASSIF_NOT_SUPPORTED,
+    ESP_BT_STATUS_HCI_INSUFFCIENT_SECURITY,
+    ESP_BT_STATUS_HCI_PARAM_OUT_OF_RANGE,
+    ESP_BT_STATUS_HCI_UNDEFINED_0x31,
+    ESP_BT_STATUS_HCI_ROLE_SWITCH_PENDING,
+    ESP_BT_STATUS_HCI_UNDEFINED_0x33,
+    ESP_BT_STATUS_HCI_RESERVED_SLOT_VIOLATION,
+    ESP_BT_STATUS_HCI_ROLE_SWITCH_FAILED,
+    ESP_BT_STATUS_HCI_INQ_RSP_DATA_TOO_LARGE,
+    ESP_BT_STATUS_HCI_SIMPLE_PAIRING_NOT_SUPPORTED,
+    ESP_BT_STATUS_HCI_HOST_BUSY_PAIRING,
+    ESP_BT_STATUS_HCI_REJ_NO_SUITABLE_CHANNEL,
+    ESP_BT_STATUS_HCI_CONTROLLER_BUSY,
+    ESP_BT_STATUS_HCI_UNACCEPT_CONN_INTERVAL,
+    ESP_BT_STATUS_HCI_DIRECTED_ADVERTISING_TIMEOUT,
+    ESP_BT_STATUS_HCI_CONN_TOUT_DUE_TO_MIC_FAILURE,
+    ESP_BT_STATUS_HCI_CONN_FAILED_ESTABLISHMENT,
+    ESP_BT_STATUS_HCI_MAC_CONNECTION_FAILED,
 } esp_bt_status_t;
 
 

tools/sdk/esp32/bin/bootloader_dout_40m.elf

@@ -223,6 +223,8 @@ typedef enum {
     ESP_BT_GAP_MODE_CHG_EVT,
     ESP_BT_GAP_REMOVE_BOND_DEV_COMPLETE_EVT,         /*!< remove bond device complete event */
     ESP_BT_GAP_QOS_CMPL_EVT,                        /*!< QOS complete event */
+    ESP_BT_GAP_ACL_CONN_CMPL_STAT_EVT,              /*!< ACL connection complete status event */
+    ESP_BT_GAP_ACL_DISCONN_CMPL_STAT_EVT,           /*!< ACL disconnection complete status event */
     ESP_BT_GAP_EVT_MAX,
 } esp_bt_gap_cb_event_t;
 
@@ -376,6 +378,24 @@ typedef union {
                                                     which from the master to a particular slave on the ACL
                                                     logical transport. unit is 0.625ms. */
     } qos_cmpl;                                /*!< QoS complete parameter struct */
+
+    /**
+     * @brief ESP_BT_GAP_ACL_CONN_CMPL_STAT_EVT
+     */
+    struct acl_conn_cmpl_stat_param {
+        esp_bt_status_t stat;                  /*!< ACL connection status */
+        uint16_t handle;                       /*!< ACL connection handle */
+        esp_bd_addr_t bda;                     /*!< remote bluetooth device address */
+    } acl_conn_cmpl_stat;                      /*!< ACL connection complete status parameter struct */
+
+    /**
+     * @brief ESP_BT_GAP_ACL_DISCONN_CMPL_STAT_EVT
+     */
+    struct acl_disconn_cmpl_stat_param {
+        esp_bt_status_t reason;                /*!< ACL disconnection reason */
+        uint16_t handle;                       /*!< ACL connection handle */
+        esp_bd_addr_t bda;                     /*!< remote bluetooth device address */
+    } acl_disconn_cmpl_stat;                   /*!< ACL disconnection complete status parameter struct */
 } esp_bt_gap_cb_param_t;
 
 /**

tools/sdk/esp32/bin/bootloader_dout_80m.elf

@@ -285,6 +285,7 @@ typedef enum {
 #define    ESP_GATT_PERM_WRITE_SIGNED_MITM     (1 << 8)   /* bit 8 -  0x0100 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED_MITM in bta/bta_gatt_api.h */
 #define    ESP_GATT_PERM_READ_AUTHORIZATION    (1 << 9)   /* bit 9 -  0x0200 */
 #define    ESP_GATT_PERM_WRITE_AUTHORIZATION   (1 << 10)  /* bit 10 - 0x0400 */
+#define    ESP_GATT_PERM_ENCRYPT_KEY_SIZE(keysize)     (((keysize - 6) & 0xF) << 12)    /* bit 12:15 - 0xF000 */
 typedef uint16_t esp_gatt_perm_t;
 
 /* relate to BTA_GATT_CHAR_PROP_BIT_xxx in bta/bta_gatt_api.h */

tools/sdk/esp32/bin/bootloader_qio_40m.elf

@@ -50,7 +50,7 @@ extern "C" {
 
 #endif //CONFIG_BT_ENABLED
 
-#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL  0x20200622
+#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL  0x20221207
 
 /**
  * @brief Bluetooth mode for controller enable/disable
@@ -128,6 +128,12 @@ the adv packet will be discarded until the memory is restored. */
     #define MESH_DUPLICATE_SCAN_CACHE_SIZE          0
 #endif
 
+#ifdef CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD
+#define SCAN_DUPL_CACHE_REFRESH_PERIOD CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD
+#else
+#define SCAN_DUPL_CACHE_REFRESH_PERIOD              0
+#endif
+
 #if defined(CONFIG_BTDM_CTRL_MODE_BLE_ONLY)
 #define BTDM_CONTROLLER_MODE_EFF                    ESP_BT_MODE_BLE
 #elif defined(CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY)
@@ -183,6 +189,7 @@ the adv packet will be discarded until the memory is restored. */
     .pcm_role = CONFIG_BTDM_CTRL_PCM_ROLE_EFF,                             \
     .pcm_polar = CONFIG_BTDM_CTRL_PCM_POLAR_EFF,                           \
     .hli = BTDM_CTRL_HLI,                                                  \
+    .dup_list_refresh_period = SCAN_DUPL_CACHE_REFRESH_PERIOD,             \
     .magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL,                           \
 }
 
@@ -225,6 +232,7 @@ typedef struct {
     uint8_t pcm_role;                       /*!< PCM role (master & slave)*/
     uint8_t pcm_polar;                      /*!< PCM polar trig (falling clk edge & rising clk edge) */
     bool hli;                               /*!< Using high level interrupt or not */
+    uint16_t dup_list_refresh_period;       /*!< Duplicate scan list refresh period */
     uint32_t magic;                         /*!< Magic number */
 } esp_bt_controller_config_t;
 

tools/sdk/esp32/bin/bootloader_qio_80m.elf

@@ -449,7 +449,6 @@ esp_err_t gpio_force_hold_all(void);
 esp_err_t gpio_force_unhold_all(void);
 #endif
 
-#if SOC_GPIO_SUPPORT_SLP_SWITCH
 /**
   * @brief Enable SLP_SEL to change GPIO status automantically in lightsleep.
   * @param gpio_num GPIO number of the pad.
@@ -496,7 +495,6 @@ esp_err_t gpio_sleep_set_direction(gpio_num_t gpio_num, gpio_mode_t mode);
  *     - ESP_ERR_INVALID_ARG : Parameter error
  */
 esp_err_t gpio_sleep_set_pull_mode(gpio_num_t gpio_num, gpio_pull_mode_t pull);
-#endif
 
 #if SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP
 

tools/sdk/esp32/bin/bootloader_qout_40m.elf

@@ -248,7 +248,8 @@ int spicommon_irqdma_source_for_host(spi_host_device_t host);
 */
 typedef void(*dmaworkaround_cb_t)(void *arg);
 
-
+#if CONFIG_IDF_TARGET_ESP32
+//This workaround is only for esp32
 /**
  * @brief Request a reset for a certain DMA channel
  *
@@ -303,6 +304,7 @@ void spicommon_dmaworkaround_idle(int dmachan);
  * @note This public API is deprecated.
  */
 void spicommon_dmaworkaround_transfer_active(int dmachan);
+#endif  //#if CONFIG_IDF_TARGET_ESP32
 
 /*******************************************************************************
  * Bus attributes