8000 Merge pull request #65 from husigeza/idf_3.3_support · pycom/pycom-micropython-sigfox@aca4712 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit aca4712

Browse files
geza-pycomgeza-pycom
authored
Merge pull request #65 from husigeza/idf_3.3_support
Changes needed for idf 3.3.
2 parents 57b1110 + 8bc1f0c commit aca4712

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+657
-16
lines changed

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ node {
99
stage('Checkout') {
1010
checkout scm
1111
sh 'rm -rf esp-idf'
12-
sh 'git clone --depth=1 --recursive -b idf_v3.2 https://github.com/pycom/pycom-esp-idf.git esp-idf'
12+
sh 'git clone --depth=1 --recursive -b idf_v3.3 https://github.com/pycom/pycom-esp-idf.git esp-idf'
1313
}
1414

1515
stage('git-tag') {

‎esp32/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ifeq ($(wildcard boards/$(BOARD)/.),)
1414
$(error Invalid BOARD specified)
1515
endif
1616

17-
IDF_VERSION=3.2
17+
IDF_VERSION=3.3
1818

1919
TARGET ?= boot_app
2020

@@ -103,7 +103,7 @@ LIBS = -L$(ESP_IDF_COMP_PATH)/esp32/lib -L$(ESP_IDF_COMP_PATH)/esp32/ld -L$(ESP_
103103
$(ESP_IDF_COMP_PATH)/newlib/lib/libc-psram-workaround.a \
104104
-lfreertos -ljson -ljsmn -llwip -lnewlib -lvfs -lopenssl -lmbedtls -lwpa_supplicant \
105105
-lxtensa-debug-module -lbt -lsdmmc -lsoc -lheap -lbootloader_support -lmicro-ecc \
106-
-u ld_include_panic_highint_hdl -lsmartconfig_ack -lmesh -lesp_ringbuf -lcoap
106+
-u ld_include_panic_highint_hdl -lsmartconfig_ack -lmesh -lesp_ringbuf -lcoap -lefuse -lespcoredump -lapp_update
107107
ifeq ($(BOARD), $(filter $(BOARD), FIPY))
108108
LIBS += sigfox/modsigfox_fipy.a
109109
endif

‎esp32/application.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ SRC_QSTR_AUTO_DEPS +=
366366
BOOT_LDFLAGS = $(LDFLAGS) -T esp32.bootloader.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.bootloader.rom.ld -T esp32.rom.spiram_incompatible_fns.ld
367367

368368
# add the application linker script(s)
369-
APP_LDFLAGS += $(LDFLAGS) -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T wifi_iram.ld
369+
APP_LDFLAGS += $(LDFLAGS) -T esp32_out.ld -T esp32.project.ld -T esp32.rom.ld -T esp32.peripherals.ld
370370

371371
# add the application specific CFLAGS
372372
CFLAGS += $(APP_INC) -DMICROPY_NLR_SETJMP=1 -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM -DFFCONF_H=\"lib/oofatfs/ffconf.h\" -DWITH_POSIX
@@ -639,7 +639,7 @@ $(BUILD)/application.a: $(OBJ)
639639
$(ECHO) "AR $@"
640640
$(Q) rm -f $@
641641
$(Q) $(AR) cru $@ $^
642-
$(BUILD)/application.elf: $(BUILD)/application.a $(BUILD)/esp32_out.ld $(SECURE_BOOT_VERIFICATION_KEY)
642+
$(BUILD)/application.elf: $(BUILD)/application.a $(BUILD)/esp32_out.ld esp32.project.ld $(SECURE_BOOT_VERIFICATION_KEY)
643643
ifeq ($(SECURE), on)
644644
# unpack libbootloader_support.a, and archive again using the right key for verifying signatures
645645
$(ECHO) "Inserting verification key $(SECURE_BOOT_VERIFICATION_KEY) in $@"

‎esp32/bootloader/lib/libbootloader_support.a

3.34 KB
Binary file not shown.

‎esp32/bootloader/lib/liblog.a

108 Bytes
Binary file not shown.

‎esp32/bootloader/lib/libmicro-ecc.a

52 Bytes
Binary file not shown.

‎esp32/bootloader/lib/libsoc.a

2.41 KB
Binary file not shown.

‎esp32/bootloader/lib/libspi_flash.a

68 Bytes
Binary file not shown.

‎esp32/esp32.project.ld

Lines changed: 618 additions & 0 deletions
Large diffs are not rendered by default.

‎esp32/get_idf_libs.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ def main():
6161
shutil.copy(src + '/xtensa-debug-module/libxtensa-debug-module.a', dsttmpapp)
6262
shutil.copy(src + '/esp_ringbuf/libesp_ringbuf.a', dsttmpapp)
6363
shutil.copy(src + '/coap/libcoap.a', dsttmpapp)
64+
shutil.copy(src + '/efuse/libefuse.a', dsttmpapp)
65+
shutil.copy(src + '/espcoredump/libespcoredump.a', dsttmpapp)
66+
shutil.copy(src + '/app_update/libapp_update.a', dsttmpapp)
67+
6468
except:
6569
print("Couldn't Copy IDF libs defaulting to Local Lib Folders!")
6670
traceback.print_exc()
@@ -74,10 +78,16 @@ def main():
7478
for item in os.listdir(dsttmpapp):
7579
shutil.copy(dsttmpapp + '/' + item, dstapp + '/' + item)
7680

81+
# copy the project's linker script
82+
shutil.copy(src + '/esp32/esp32.project.ld', ".")
83+
84+
# copy the generated sdkconfig.h
85+
shutil.copy(src + '/include/sdkconfig.h', ".")
86+
7787
shutil.rmtree(dsttmpbl)
7888
shutil.rmtree(dsttmpapp)
7989

80-
print("IDF Libs copied Successfully!")
90+
print("IDF Libs, linker script and skdconfig.h copied Successfully!")
8191

8292

8393
if __name__ == "__main__":

‎esp32/lib/libbootloader_support.a

-10.6 KB
Binary file not shown.

‎esp32/lib/libbt.a

63.2 KB
Binary file not shown.

‎esp32/lib/libcoap.a

1.5 KB
Binary file not shown.

‎esp32/lib/libcxx.a

328 Bytes
Binary file not shown.

‎esp32/lib/libdriver.a

7.22 KB
Binary file not shown.

‎esp32/lib/libesp32.a

10.4 KB
Binary file not shown.

‎esp32/lib/libesp_adc_cal.a

112 Bytes
Binary file not shown.

‎esp32/lib/libesp_ringbuf.a

176 Bytes
Binary file not shown.

‎esp32/lib/libexpat.a

344 Bytes
Binary file not shown.

‎esp32/lib/libfreertos.a

1.51 KB
Binary file not shown.

‎esp32/lib/libheap.a

8.7 KB
Binary file not shown.

‎esp32/lib/libjsmn.a

56 Bytes
Binary file not shown.

‎esp32/lib/libjson.a

136 Bytes
Binary file not shown.

‎esp32/lib/liblog.a

844 Bytes
Binary file not shown.

‎esp32/lib/liblwip.a

9.36 KB
Binary file not shown.

‎esp32/lib/libmbedtls.a

-9.01 KB
Binary file not shown.

‎esp32/lib/libmicro-ecc.a

56 Bytes
Binary file not shown.

‎esp32/lib/libnewlib.a

10.2 KB
Binary file not shown.

‎esp32/lib/libnghttp.a

2.06 KB
Binary file not shown.

‎esp32/lib/libnvs_flash.a

3.1 KB
Binary file not shown.

‎esp32/lib/libopenssl.a

720 Bytes
Binary file not shown.

‎esp32/lib/libpthread.a

4.1 KB
Binary file not shown.

‎esp32/lib/libsdmmc.a

908 Bytes
Binary file not shown.

‎esp32/lib/libsmartconfig_ack.a

32 Bytes
Binary file not shown.

‎esp32/lib/libsoc.a

2.53 KB
Binary file not shown.

‎esp32/lib/libspi_flash.a

8.07 KB
Binary file not shown.

‎esp32/lib/libtcpip_adapter.a

988 Bytes
Binary file not shown.

‎esp32/lib/libvfs.a

4.71 KB
Binary file not shown.

‎esp32/lib/libwpa_supplicant.a

8.99 KB
Binary file not shown.

‎esp32/lib/libxtensa-debug-module.a

156 Bytes
Binary file not shown.

‎esp32/sdkconfig.h

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#define CONFIG_BLE_SMP_ENABLE 1
1212
#define CONFIG_FATFS_LFN_NONE 1
1313
#define CONFIG_SPIRAM_TYPE_AUTO 1
14+
#define CONFIG_SMP_SLAVE_CON_PARAMS_UPD_ENABLE 1
1415
#define CONFIG_MB_SERIAL_TASK_PRIO 10
1516
#define CONFIG_TCP_RECVMBOX_SIZE 6
1617
#define CONFIG_FATFS_CODEPAGE_437 1
@@ -23,6 +24,7 @@
2324
#define CONFIG_SPIFFS_USE_MAGIC_LENGTH 1
2425
#define CONFIG_ESPTOOLPY_FLASHSIZE_4MB 1
2526
#define CONFIG_IPC_TASK_STACK_SIZE 1024
27+
#define CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES 16
2628
#define CONFIG_FATFS_PER_FILE_CACHE 1
2729
#define CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY 1
2830
#define CONFIG_ESPTOOLPY_FLASHFREQ "80m"
@@ -55,7 +57,7 @@
5557
#define CONFIG_MBEDTLS_SSL_ALPN 1
5658
#define CONFIG_MBEDTLS_PEM_WRITE_C 1
5759
#define CONFIG_BT_RESERVE_DRAM 0xdb5c
58-
#define CONFIG_SECURE_SIGNED_ON_BOOT 1
60+
#define CONFIG_APP_COMPILE_TIME_DATE 1
5961
#define CONFIG_D2WD_PSRAM_CLK_IO 9
6062
#define CONFIG_FATFS_FS_LOCK 0
6163
#define CONFIG_IP_LOST_TIMER_INTERVAL 120
@@ -71,18 +73,19 @@
7173
#define CONFIG_LWIP_MAX_SOCKETS 10
7274
#define CONFIG_LWIP_NETIF_LOOPBACK 1
7375
#define CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL 16384
76+
#define CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT "pthread"
7477
#define CONFIG_EMAC_TASK_PRIORITY 20
7578
#define CONFIG_TIMER_TASK_STACK_DEPTH 2560
7679
#define CONFIG_TCP_MSS 1436
7780
#define CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED 1
81+
#define CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR 1
7882
#define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF 3
83+
#define CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4 1
7984
#define CONFIG_TCPIP_TASK_AFFINITY_CPU0 1
8085
#define CONFIG_FATFS_CODEPAGE 437
8186
#define CONFIG_ESP32_DEFAULT_CPU_FREQ_160 1
8287
#define CONFIG_ULP_COPROC_RESERVE_MEM 0
83-
#define CONFIG_SECURE_SIGNED_APPS 1
8488
#define CONFIG_LWIP_MAX_UDP_PCBS 16
85-
#define CONFIG_SMP_ENABLE 1
8689
#define CONFIG_ESPTOOLPY_BAUD 921600
8790
#define CONFIG_ADC_CAL_LUT_ENABLE 1
8891
#define CONFIG_WIFI_FAST_SCAN 1
@@ -107,19 +110,21 @@
107110
#define CONFIG_TIMER_TASK_STACK_SIZE 2560
108111
#define CONFIG_MBEDTLS_X509_CRL_PARSE_C 1
109112
#define CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC 1
113+
#define CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER 1
110114
#define CONFIG_HTTPD_PURGE_BUF_LEN 32
111115
#define CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR 1
116+
#define CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER 1
112117
#define CONFIG_MB_SERIAL_TASK_STACK_SIZE 768
113118
#define CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO 1
114119
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
120+
#define CONFIG_EFUSE_MAX_BLK_LEN 192
115121
#define CONFIG_SPIFFS_USE_MAGIC 1
116122
#define CONFIG_TCPIP_TASK_STACK_SIZE 3072
117123
#define CONFIG_BLUEDROID_PINNED_TO_CORE_0 1
118124
#define CONFIG_MAIN_TASK_STACK_SIZE 4096
119125
#define CONFIG_SPIFFS_PAGE_CHECK 1
120126
#define CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 1
121127
#define CONFIG_LWIP_MAX_ACTIVE_TCP 16
122-
#define CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES 1
123128
#define CONFIG_ESPTOOLPY_FLASHMODE "dio"
124129
#define CONFIG_BTC_TASK_STACK_SIZE 3328
125130
#define CONFIG_BLUEDROID_ENABLED 1
@@ -146,6 +151,7 @@
146151
#define CONFIG_ESP32_WIFI_TX_BA_WIN 6
147152
#define CONFIG_ESP32_WIFI_NVS_ENABLED 1
148153
#define CONFIG_MDNS_MAX_SERVICES 10
154+
#define CONFIG_IDF_TARGET_ESP32 1
149155
#define CONFIG_EMAC_CHECK_LINK_PERIOD_MS 2000
150156
#define CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL 1
151157
#define CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED 1
@@ -172,6 +178,7 @@
172178
#define CONFIG_ESP32_WIFI_MGMT_SBUF_NUM 32
173179
#define CONFIG_PARTITION_TABLE_SINGLE_APP 1
174180
#define CONFIG_SPIRAM_USE_MALLOC 1
181+
#define CONFIG_UNITY_ENABLE_FLOAT 1
175182
#define CONFIG_ESP32_WIFI_RX_BA_WIN 16
176183
#define CONFIG_MBEDTLS_X509_CSR_PARSE_C 1
177184
#define CONFIG_SPIFFS_USE_MTIME 1
@@ -192,7 +199,6 @@
192199
#define CONFIG_MBEDTLS_PEM_PARSE_C 1
193200
#define CONFIG_SPIFFS_GC_MAX_RUNS 10
194201
#define CONFIG_ESP32_APPTRACE_DEST_NONE 1
195-
#define CONFIG_SECURE_BOOTLOADER_KEY_ENCODING_256BIT 1
196202
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 1
197203
#define CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA 1
198204
#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32
@@ -213,10 +219,13 @@
213219
#define CONFIG_MBEDTLS_TLS_ENABLED 1
214220
#define CONFIG_LWIP_MAX_RAW_PCBS 16
215221
#define CONFIG_SPIRAM_IGNORE_NOTFOUND 1
222+
#define CONFIG_BTU_TASK_STACK_SIZE 4096
223+
#define CONFIG_SMP_ENABLE 1
216224
#define CONFIG_SPIRAM_SIZE -1
217225
#define CONFIG_FAST_SCAN_MINIMUM_SIGNAL -127
218226
#define CONFIG_MBEDTLS_SSL_SESSION_TICKETS 1
219227
#define CONFIG_SPIFFS_MAX_PARTITIONS 3
228+
#define CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM 64
220229
#define CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0 1
221230
#define CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK 1
222231
#define CONFIG_MBEDTLS_SSL_RENEGOTIATION 1
@@ -225,7 +234,6 @@
225234
#define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
226235
#define CONFIG_PPP_MPPE_SUPPORT 1
227236
#define CONFIG_FAST_SCAN_THRESHOLD 1
228-
#define CONFIG_SECURE_BOOTLOADER_REFLASHABLE 1
229237
#define CONFIG_SPIFFS_OBJ_NAME_LEN 32
230238
#define CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT 5
231239
#define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF 0
@@ -249,34 +257,38 @@
249257
#define CONFIG_PPP_PAP_SUPPORT 1
250258
#define CONFIG_MBEDTLS_TLS_CLIENT 1
251259
#define CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI 1
252-
#define CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_EFF 0
253260
#define CONFIG_BT_ENABLED 1
261+
#define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY 1
254262
#define CONFIG_D0WD_PSRAM_CLK_IO 17
255263
#define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
256264
#define CONFIG_MONITOR_BAUD 115200
265+
#define CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT -1
257266
#define CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT 30
258267
#define CONFIG_TCPIP_LWIP 1
259268
#define CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES 1
260269
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST 1
261270
#define CONFIG_FREERTOS_CORETIMER_0 1
262-
#define CONFIG_IDF_FIRMWARE_CHIP_ID 0x0000
271+
#define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
263272
#define CONFIG_MBEDTLS_HAVE_TIME 1
264273
#define CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY 1
265274
#define CONFIG_TCP_QUEUE_OOSEQ 1
266-
#define CONFIG_ESP32_CORE_DUMP_LOG_LEVEL 1
275+
#define CONFIG_FATFS_ALLOC_PREFER_EXTRAM 1
267276
#define CONFIG_GATTS_ENABLE 1
268277
#define CONFIG_ADC_CAL_EFUSE_VREF_ENABLE 1
269278
#define CONFIG_MBEDTLS_TLS_SERVER 1
270279
#define CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT 1
280+
#define CONFIG_APP_EXCLUDE_PROJECT_VER_VAR 1
271281
#define CONFIG_SPIRAM_BOOT_INIT 1
272282
#define CONFIG_ESPTOOLPY_AFTER_NORESET 1
273283
#define CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED 1
274284
#define CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL 16384
275285
#define CONFIG_FREERTOS_ISR_STACKSIZE 2560
276286
#define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1
287+
#define CONFIG_IDF_TARGET "esp32"
277288
#define CONFIG_WL_SECTOR_SIZE_4096 1
278289
#define CONFIG_FREERTOS_NO_AFFINITY 0x7FFFFFFF
279290
#define CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED 1
291+
#define CONFIG_HTTPD_ERR_RESP_NO_DELAY 1
280292
#define CONFIG_SCAN_DUPLICATE_TYPE 0
281293
#define CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED 1
282294
#define CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED 1
@@ -293,7 +305,6 @@
293305
#define CONFIG_LWIP_LOOPBACK_MAX_PBUFS 8
294306
#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
295307
#define CONFIG_SPIFFS_PAGE_SIZE 256
296-
#define CONFIG_SECURE_SIGNED_ON_UPDATE 1
297308
#define CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED 1
298309
#define CONFIG_ESP32_DPORT_WORKAROUND 1
299310
#define CONFIG_PPP_MSCHAP_SUPPORT 1
@@ -304,7 +315,9 @@
304315
#define CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF 1
305316
#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0"
306317
#define CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS 1
318+
#define CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF 0
307319
#define CONFIG_OPTIMIZATION_LEVEL_RELEASE 1
320+
#define CONFIG_UNITY_ENABLE_DOUBLE 1
308321
#define CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD 20
309322
#define CONFIG_BLUEDROID_PINNED_TO_CORE 0
310323
#define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1

0 commit comments

Comments
 (0)
0