From 1312c6b5f9e5803f785b6115db17a1d6a28244ca Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Sat, 28 Sep 2019 03:08:40 +0300 Subject: [PATCH 1/8] Add support for IDF v3.3 --- sdkconfig | 70 +++++++++++++++++++++++++++++++++++++------ tools/config.sh | 2 +- tools/prepare-libs.sh | 3 +- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/sdkconfig b/sdkconfig index 876803fb..0eb79d44 100644 --- a/sdkconfig +++ b/sdkconfig @@ -2,7 +2,7 @@ # Automatically generated file; DO NOT EDIT. # Espressif IoT Development Framework Configuration # -CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 +CONFIG_IDF_TARGET="esp32" # # SDK tool configuration @@ -11,6 +11,13 @@ CONFIG_TOOLPREFIX="xtensa-esp32-elf-" CONFIG_PYTHON="python" CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y +# +# Application manager +# +CONFIG_APP_COMPILE_TIME_DATE=y +CONFIG_APP_EXCLUDE_PROJECT_VER_VAR= +CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR= + # # Arduino Configuration # @@ -68,6 +75,7 @@ CONFIG_BOOTLOADER_APP_TEST= CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE= CONFIG_BOOTLOADER_WDT_TIME_MS=9000 +CONFIG_APP_ROLLBACK_ENABLE= # # Security features @@ -177,9 +185,6 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=y CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_HCI= -CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_EFF=1 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 @@ -211,6 +216,7 @@ CONFIG_BLUEDROID_PINNED_TO_CORE_0=y CONFIG_BLUEDROID_PINNED_TO_CORE_1= CONFIG_BLUEDROID_PINNED_TO_CORE=0 CONFIG_BTC_TASK_STACK_SIZE=8192 +CONFIG_BTU_TASK_STACK_SIZE=4096 CONFIG_BLUEDROID_MEM_DEBUG= CONFIG_CLASSIC_BT_ENABLED=y CONFIG_A2DP_ENABLE=y @@ -221,6 +227,7 @@ CONFIG_HFP_ENABLE=y CONFIG_HFP_CLIENT_ENABLE=y CONFIG_HFP_AUDIO_DATA_PATH_PCM=y CONFIG_HFP_AUDIO_DATA_PATH_HCI= +CONFIG_BT_SSP_ENABLED=y CONFIG_GATTS_ENABLE=y CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL= CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y @@ -256,6 +263,16 @@ CONFIG_SPI_MASTER_IN_IRAM= CONFIG_SPI_MASTER_ISR_IN_IRAM=y CONFIG_SPI_SLAVE_IN_IRAM= CONFIG_SPI_SLAVE_ISR_IN_IRAM=y + +# +# eFuse Bit Manager +# +CONFIG_EFUSE_CUSTOM_TABLE= +CONFIG_EFUSE_VIRTUAL= +CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE= +CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y +CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT= +CONFIG_EFUSE_MAX_BLK_LEN=192 CONFIG_C_IMPL= CONFIG_XTENSA_IMPL=y @@ -273,6 +290,7 @@ CONFIG_FRMN2C_QUANT= # # ESP32-specific # +CONFIG_IDF_TARGET_ESP32=y CONFIG_ESP32_REV_MIN_0=y CONFIG_ESP32_REV_MIN_1= CONFIG_ESP32_REV_MIN_2= @@ -324,10 +342,6 @@ CONFIG_MEMMAP_TRACEMEM= CONFIG_MEMMAP_TRACEMEM_TWOBANKS= CONFIG_ESP32_TRAX= CONFIG_TRACEMEM_RESERVE_DRAM=0x0 -CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH= -CONFIG_ESP32_ENABLE_COREDUMP_TO_UART= -CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y -CONFIG_ESP32_ENABLE_COREDUMP= CONFIG_TWO_UNIVERSAL_MAC_ADDRESS= CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 @@ -418,8 +432,9 @@ CONFIG_ESP32_WIFI_NVS_ENABLED=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1= CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_IRAM_OPT=y CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 +CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE= +CONFIG_ESP32_WIFI_IRAM_OPT=y # # PHY @@ -467,9 +482,23 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y # CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 CONFIG_HTTPD_MAX_URI_LEN=512 +CONFIG_HTTPD_ERR_RESP_NO_DELAY=y CONFIG_HTTPD_PURGE_BUF_LEN=32 CONFIG_HTTPD_LOG_PURGE_DATA= +# +# ESP HTTPS OTA +# +CONFIG_OTA_ALLOW_HTTP= + +# +# Core dump +# +CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH= +CONFIG_ESP32_ENABLE_COREDUMP_TO_UART= +CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y +CONFIG_ESP32_ENABLE_COREDUMP= + # # Ethernet # @@ -516,6 +545,7 @@ CONFIG_FATFS_API_ENCODING_UTF_8= CONFIG_FATFS_FS_LOCK=0 CONFIG_FATFS_TIMEOUT_MS=10000 CONFIG_FATFS_PER_FILE_CACHE=y +CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y # # Modbus configuration @@ -564,6 +594,8 @@ CONFIG_FREERTOS_USE_TRACE_FACILITY= CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS= CONFIG_FREERTOS_DEBUG_INTERNALS= CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y +CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y +CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE= # # Heap memory debugging @@ -650,6 +682,7 @@ CONFIG_TCPIP_TASK_AFFINITY_CPU0=y CONFIG_TCPIP_TASK_AFFINITY_CPU1= CONFIG_TCPIP_TASK_AFFINITY=0x0 CONFIG_PPP_SUPPORT=y +CONFIG_PPP_NOTIFY_PHASE_SUPPORT= CONFIG_PPP_PAP_SUPPORT=y CONFIG_PPP_CHAP_SUPPORT=y CONFIG_PPP_MSCHAP_SUPPORT=y @@ -786,6 +819,11 @@ CONFIG_OPENSSL_ASSERT_EXIT= CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 CONFIG_PTHREAD_STACK_MIN=768 +CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y +CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0= +CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1= +CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1 +CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" # # SPI Flash driver @@ -835,6 +873,15 @@ CONFIG_SPIFFS_TEST_VISUALISATION= CONFIG_IP_LOST_TIMER_INTERVAL=120 CONFIG_TCPIP_LWIP=y +# +# Unity unit testing library +# +CONFIG_UNITY_ENABLE_FLOAT=y +CONFIG_UNITY_ENABLE_DOUBLE=y +CONFIG_UNITY_ENABLE_COLOR= +CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y +CONFIG_UNITY_ENABLE_FIXTURE= + # # Virtual file system # @@ -847,3 +894,8 @@ CONFIG_SUPPORT_TERMIOS=y CONFIG_WL_SECTOR_SIZE_512= CONFIG_WL_SECTOR_SIZE_4096=y CONFIG_WL_SECTOR_SIZE=4096 + +# +# Wi-Fi Provisioning Manager +# +CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 diff --git a/tools/config.sh b/tools/config.sh index 02c79320..7db15d26 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -9,7 +9,7 @@ IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-8 IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-80-g6c4433a-5.2.0.tar.gz" if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="release/v3.2" + IDF_BRANCH="release/v3.3" fi # Owner of the target ESP32 Arduino repository diff --git a/tools/prepare-libs.sh b/tools/prepare-libs.sh index 65390ec2..63ff7b2e 100755 --- a/tools/prepare-libs.sh +++ b/tools/prepare-libs.sh @@ -143,8 +143,7 @@ cp $IDF_COMPS/partition_table/gen_esp32part.py $AR_GEN_PART_PY mkdir -p $AR_SDK/ld && find $IDF_COMPS/esp32/ld -name '*.ld' -exec cp -f {} $AR_SDK/ld/ \; # ld script -cp -f build/esp32/esp32_out.ld $AR_SDK/ld/ -#cp -f build/esp32/esp32.common.ld $AR_SDK/ld/ +cp -f build/esp32/*.ld $AR_SDK/ld/ # Add IDF versions to sdkconfig echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> $AR_SDK/include/config/sdkconfig.h From f93aa972b57f3e6909ea26fba5afd7be4653acee Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Wed, 9 Oct 2019 10:28:08 +0300 Subject: [PATCH 2/8] Update build-libs.sh --- tools/build-libs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build-libs.sh b/tools/build-libs.sh index eae13d4d..33d5daaa 100755 --- a/tools/build-libs.sh +++ b/tools/build-libs.sh @@ -15,5 +15,6 @@ $SED -i '/CONFIG_ESP32_DEFAULT_CPU_FREQ_240/c\CONFIG_ESP32_DEFAULT_CPU_FREQ_240= $SED -i '/CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ/c\CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240' ./sdkconfig # make the example +make defconfig make -j8 #fixes make issue where build fails in arduino core subfolder make -j8 idf-libs || exit 1 From dc99609d9b2f5c70e4dfa3d3db3c1812397ecef4 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Wed, 9 Oct 2019 10:34:17 +0300 Subject: [PATCH 3/8] Update build-bootloaders.sh --- tools/build-bootloaders.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/build-bootloaders.sh b/tools/build-bootloaders.sh index bfe53db4..150d01d1 100755 --- a/tools/build-bootloaders.sh +++ b/tools/build-bootloaders.sh @@ -22,6 +22,7 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER QIO 80MHz *******" +make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_qio_80m.bin @@ -30,6 +31,7 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER QOUT 80MHz *******" +make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_qout_80m.bin @@ -40,6 +42,7 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER DIO 80MHz *******" +make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_dio_80m.bin @@ -48,6 +51,7 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=y' ./sdkconfig echo "******** BUILDING BOOTLOADER DOUT 80MHz *******" +make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_dout_80m.bin @@ -62,6 +66,7 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER QIO 40MHz *******" +make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_qio_40m.bin @@ -70,6 +75,7 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER QOUT 40MHz *******" +make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_qout_40m.bin @@ -80,6 +86,7 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER DIO 40MHz *******" +make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_dio_40m.bin @@ -88,6 +95,7 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=y' ./sdkconfig echo "******** BUILDING BOOTLOADER DOUT 40MHz *******" +make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_dout_40m.bin From 8a81403d781e25602fdfce627ba3903487693b6d Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Wed, 9 Oct 2019 13:28:13 +0300 Subject: [PATCH 4/8] Update cron.yml --- .github/workflows/cron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index d158f881..d8df43fa 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - idf_branch: [release/v3.2] + idf_branch: [release/v3.2, release/v3.3] steps: - uses: actions/checkout@v1 - name: Install dependencies From 6b2a60231a7da2a0ca411674e97365145d518ff0 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Mon, 20 Jan 2020 19:58:40 +0200 Subject: [PATCH 5/8] Update sdkconfig --- sdkconfig | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/sdkconfig b/sdkconfig index 0eb79d44..67c2b8df 100644 --- a/sdkconfig +++ b/sdkconfig @@ -3,6 +3,7 @@ # Espressif IoT Development Framework Configuration # CONFIG_IDF_TARGET="esp32" +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 # # SDK tool configuration @@ -185,6 +186,7 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=y CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 +CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 @@ -211,6 +213,7 @@ CONFIG_BLE_MESH_SCAN_DUPLICATE_EN= CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100 CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 +CONFIG_BTDM_COEX_BT_OPTIONS= CONFIG_BLUEDROID_ENABLED=y CONFIG_BLUEDROID_PINNED_TO_CORE_0=y CONFIG_BLUEDROID_PINNED_TO_CORE_1= @@ -282,10 +285,17 @@ CONFIG_XTENSA_IMPL=y CONFIG_MTMN_LITE_QUANT=y CONFIG_MTMN_LITE_FLOAT= CONFIG_MTMN_HEAVY_QUANT= -CONFIG_FRMN1_QUANT=y -CONFIG_FRMN2_QUANT= -CONFIG_FRMN2P_QUANT= -CONFIG_FRMN2C_QUANT= +CONFIG_FRMN= +CONFIG_MFN56_1X=y +CONFIG_MFN56_2X= +CONFIG_MFN56_3X= +CONFIG_MFN56_4X= + +# +# Object Detection +# +CONFIG_LSSH_SPARSE_MN_5=y +CONFIG_LSSH_WITH_LANDMARK= # # ESP32-specific @@ -435,6 +445,7 @@ CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE= CONFIG_ESP32_WIFI_IRAM_OPT=y +CONFIG_ESP32_WIFI_RX_IRAM_OPT= # # PHY @@ -476,6 +487,7 @@ CONFIG_EVENT_LOOP_PROFILING= # ESP HTTP client # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y +CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH= # # HTTP Server @@ -629,11 +641,11 @@ CONFIG_LOG_COLORS= CONFIG_L2_TO_L3_COPY= CONFIG_LWIP_IRAM_OPTIMIZATION= CONFIG_LWIP_MAX_SOCKETS=10 +CONFIG_LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS=y CONFIG_USE_ONLY_LWIP_SELECT= CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE_RXTOALL=y CONFIG_LWIP_SO_RCVBUF=y -CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 CONFIG_LWIP_IP_FRAG= CONFIG_LWIP_IP_REASSEMBLY= CONFIG_LWIP_STATS= @@ -700,6 +712,12 @@ CONFIG_LWIP_BROADCAST_PING= # CONFIG_LWIP_MAX_RAW_PCBS=16 +# +# SNTP +# +CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 +CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 + # # mbedTLS # @@ -710,6 +728,8 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC= CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN= CONFIG_MBEDTLS_DEBUG= +CONFIG_MBEDTLS_ECP_RESTARTABLE= +CONFIG_MBEDTLS_CMAC_C= CONFIG_MBEDTLS_HARDWARE_AES=y CONFIG_MBEDTLS_HARDWARE_MPI= CONFIG_MBEDTLS_HARDWARE_SHA= From b7fafd354d238ea62699aba353d3b0cca03445e7 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Mon, 20 Jan 2020 21:23:37 +0200 Subject: [PATCH 6/8] Update build scripts --- tools/build-bootloaders.sh | 11 ++--------- tools/build-libs.sh | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/build-bootloaders.sh b/tools/build-bootloaders.sh index 150d01d1..83df37fd 100755 --- a/tools/build-bootloaders.sh +++ b/tools/build-bootloaders.sh @@ -14,15 +14,15 @@ $SED -i '/CONFIG_ESPTOOLPY_FLASHFREQ_40M/c\CONFIG_ESPTOOLPY_FLASHFREQ_40M=' ./sd $SED -i '/CONFIG_SPIRAM_SPEED_40M/c\CONFIG_SPIRAM_SPEED_40M=' ./sdkconfig echo "CONFIG_SPIRAM_SPEED_80M=y" >> ./sdkconfig echo "CONFIG_BOOTLOADER_SPI_WP_PIN=7" >> ./sdkconfig -echo "CONFIG_SPIRAM_OCCUPY_VSPI_HOST=" >> ./sdkconfig echo "CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y" >> ./sdkconfig +echo "CONFIG_SPIRAM_OCCUPY_VSPI_HOST=" >> ./sdkconfig +echo "CONFIG_SPIRAM_OCCUPY_NO_HOST=" >> ./sdkconfig $SED -i '/CONFIG_FLASHMODE_QIO/c\CONFIG_FLASHMODE_QIO=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER QIO 80MHz *******" -make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_qio_80m.bin @@ -31,7 +31,6 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER QOUT 80MHz *******" -make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_qout_80m.bin @@ -42,7 +41,6 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER DIO 80MHz *******" -make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_dio_80m.bin @@ -51,7 +49,6 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=y' ./sdkconfig echo "******** BUILDING BOOTLOADER DOUT 80MHz *******" -make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_dout_80m.bin @@ -66,7 +63,6 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER QIO 40MHz *******" -make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_qio_40m.bin @@ -75,7 +71,6 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER QOUT 40MHz *******" -make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_qout_40m.bin @@ -86,7 +81,6 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=y' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=' ./sdkconfig echo "******** BUILDING BOOTLOADER DIO 40MHz *******" -make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_dio_40m.bin @@ -95,7 +89,6 @@ $SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DIO/c\CONFIG_FLASHMODE_DIO=' ./sdkconfig $SED -i '/CONFIG_FLASHMODE_DOUT/c\CONFIG_FLASHMODE_DOUT=y' ./sdkconfig echo "******** BUILDING BOOTLOADER DOUT 40MHz *******" -make defconfig make -j8 bootloader || exit 1 cp build/bootloader/bootloader.bin $TARGET_PATH/bootloader_dout_40m.bin diff --git a/tools/build-libs.sh b/tools/build-libs.sh index 33d5daaa..eae13d4d 100755 --- a/tools/build-libs.sh +++ b/tools/build-libs.sh @@ -15,6 +15,5 @@ $SED -i '/CONFIG_ESP32_DEFAULT_CPU_FREQ_240/c\CONFIG_ESP32_DEFAULT_CPU_FREQ_240= $SED -i '/CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ/c\CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240' ./sdkconfig # make the example -make defconfig make -j8 #fixes make issue where build fails in arduino core subfolder make -j8 idf-libs || exit 1 From 6963b56aebb9b18b60003db80d3b54988fad6a5e Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Mon, 20 Jan 2020 21:28:24 +0200 Subject: [PATCH 7/8] Update cron.yml --- .github/workflows/cron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index d8df43fa..12622c3f 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - idf_branch: [release/v3.2, release/v3.3] + idf_branch: [release/v3.3] steps: - uses: actions/checkout@v1 - name: Install dependencies From 3f017e9c2ff3cae467c2dfcb99c244604353bea1 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Mon, 20 Jan 2020 21:32:32 +0200 Subject: [PATCH 8/8] Update push.yml --- .github/workflows/push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 299c7894..371dc30d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - release/* pull_request: jobs: pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy