Merge branch 'feature/toolchain_2020r2_v4.1' into 'release/v4.1'
Update toolchain to esp-2020r2 (backport v4.1) See merge request espressif/esp-idf!9000
This commit is contained in:
commit
29bc65e719
|
@ -39,4 +39,4 @@ target_compile_options(${COMPONENT_LIB} PRIVATE "-fno-profile-arcs" "-fno-test-c
|
||||||
|
|
||||||
# Force app_trace to also appear later than gcov in link line
|
# Force app_trace to also appear later than gcov in link line
|
||||||
idf_component_get_property(app_trace app_trace COMPONENT_LIB)
|
idf_component_get_property(app_trace app_trace COMPONENT_LIB)
|
||||||
target_link_libraries(${COMPONENT_LIB} INTERFACE $<TARGET_FILE:${app_trace}> gcov $<TARGET_FILE:${app_trace}> ${LIBC})
|
target_link_libraries(${COMPONENT_LIB} INTERFACE $<TARGET_FILE:${app_trace}> gcov $<TARGET_FILE:${app_trace}> c)
|
||||||
|
|
|
@ -101,5 +101,19 @@ else()
|
||||||
target_compile_options(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-issue)
|
target_compile_options(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-issue)
|
||||||
# also, make sure we link with this option so correct toolchain libs are pulled in
|
# also, make sure we link with this option so correct toolchain libs are pulled in
|
||||||
target_link_libraries(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-issue)
|
target_link_libraries(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-issue)
|
||||||
|
# set strategy selected
|
||||||
|
# note that we don't need to set link options as the library linked is independent of this
|
||||||
|
if(CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST)
|
||||||
|
target_compile_options(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-strategy=dupldst)
|
||||||
|
target_link_libraries(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-strategy=dupldst)
|
||||||
|
endif()
|
||||||
|
if(CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW)
|
||||||
|
target_compile_options(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-strategy=memw)
|
||||||
|
target_link_libraries(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-strategy=memw)
|
||||||
|
endif()
|
||||||
|
if(CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS)
|
||||||
|
target_compile_options(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-strategy=nops)
|
||||||
|
target_link_libraries(${COMPONENT_LIB} PUBLIC -mfix-esp32-psram-cache-strategy=nops)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -129,6 +129,40 @@ menu "ESP32-specific"
|
||||||
|
|
||||||
The workaround is not required for ESP32 revision 3 and above.
|
The workaround is not required for ESP32 revision 3 and above.
|
||||||
|
|
||||||
|
menu "SPIRAM cache workaround debugging"
|
||||||
|
|
||||||
|
choice SPIRAM_CACHE_WORKAROUND_STRATEGY
|
||||||
|
prompt "Workaround strategy"
|
||||||
|
depends on SPIRAM_CACHE_WORKAROUND
|
||||||
|
default SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW
|
||||||
|
help
|
||||||
|
Select the workaround strategy. Note that the strategy for precompiled
|
||||||
|
libraries (libgcc, newlib, bt, wifi) is not affected by this selection.
|
||||||
|
|
||||||
|
Unless you know you need a different strategy, it's suggested you stay
|
||||||
|
with the default MEMW strategy. Note that DUPLDST can interfere with hardware
|
||||||
|
encryption and this will be automatically disabled if this workaround is selected.
|
||||||
|
'Insert nops' is the workaround that was used in older esp-idf versions. This workaround
|
||||||
|
still can cause faulty data transfers from/to SPI RAM in some situation.
|
||||||
|
|
||||||
|
config SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW
|
||||||
|
bool "Insert memw after vulnerable instructions (default)"
|
||||||
|
|
||||||
|
config SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
|
||||||
|
bool "Duplicate LD/ST for 32-bit, memw for 8/16 bit"
|
||||||
|
|
||||||
|
config SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS
|
||||||
|
bool "Insert nops between vulnerable loads/stores (old strategy, obsolete)"
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
#This needs to be Y only for the dupldst workaround
|
||||||
|
config SPIRAM_WORKAROUND_NEED_VOLATILE_SPINLOCK
|
||||||
|
bool
|
||||||
|
default "y" if SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
|
||||||
|
|
||||||
|
|
||||||
|
endmenu
|
||||||
|
|
||||||
config SPIRAM_BANKSWITCH_ENABLE
|
config SPIRAM_BANKSWITCH_ENABLE
|
||||||
bool "Enable bank switching for >4MiB external RAM"
|
bool "Enable bank switching for >4MiB external RAM"
|
||||||
default y
|
default y
|
||||||
|
|
|
@ -1,9 +1,24 @@
|
||||||
# Enable psram cache bug workaround in compiler if selected
|
# Enable psram cache bug workaround in compiler if selected
|
||||||
|
|
||||||
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
|
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
|
||||||
CFLAGS+=-mfix-esp32-psram-cache-issue
|
SPIRAM_CACHE_WORKAROUND_FLAGS = -mfix-esp32-psram-cache-issue
|
||||||
CXXFLAGS+=-mfix-esp32-psram-cache-issue
|
|
||||||
LDFLAGS+=-mfix-esp32-psram-cache-issue
|
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
|
||||||
|
SPIRAM_CACHE_WORKAROUND_FLAGS += -mfix-esp32-psram-cache-strategy=dupldst
|
||||||
endif
|
endif
|
||||||
|
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW
|
||||||
|
SPIRAM_CACHE_WORKAROUND_FLAGS += -mfix-esp32-psram-cache-strategy=memw
|
||||||
|
endif
|
||||||
|
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS
|
||||||
|
SPIRAM_CACHE_WORKAROUND_FLAGS += -mfix-esp32-psram-cache-strategy=nops
|
||||||
|
endif
|
||||||
|
|
||||||
|
CFLAGS+=$(SPIRAM_CACHE_WORKAROUND_FLAGS)
|
||||||
|
CXXFLAGS+=$(SPIRAM_CACHE_WORKAROUND_FLAGS)
|
||||||
|
LDFLAGS+=$(SPIRAM_CACHE_WORKAROUND_FLAGS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Enable dynamic esp_timer overflow value if building unit tests
|
# Enable dynamic esp_timer overflow value if building unit tests
|
||||||
ifneq ("$(filter esp32,$(TEST_COMPONENTS_LIST))","")
|
ifneq ("$(filter esp32,$(TEST_COMPONENTS_LIST))","")
|
||||||
|
|
|
@ -4,6 +4,16 @@ if(CONFIG_SPIRAM_CACHE_WORKAROUND)
|
||||||
# non-IDF CMakeLists.txt file is imported into a component) don't depend
|
# non-IDF CMakeLists.txt file is imported into a component) don't depend
|
||||||
# on the esp32 component so don't get the extra flag. This handles that case.
|
# on the esp32 component so don't get the extra flag. This handles that case.
|
||||||
idf_build_set_property(COMPILE_OPTIONS "-mfix-esp32-psram-cache-issue" APPEND)
|
idf_build_set_property(COMPILE_OPTIONS "-mfix-esp32-psram-cache-issue" APPEND)
|
||||||
|
# note that we don't need to set link options as the library linked is independent of this
|
||||||
|
if(CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST)
|
||||||
|
idf_build_set_property(COMPILE_OPTIONS "-mfix-esp32-psram-cache-strategy=dupldst" APPEND)
|
||||||
|
endif()
|
||||||
|
if(CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW)
|
||||||
|
idf_build_set_property(COMPILE_OPTIONS "-mfix-esp32-psram-cache-strategy=memw" APPEND)
|
||||||
|
endif()
|
||||||
|
if(CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS)
|
||||||
|
idf_build_set_property(COMPILE_OPTIONS "-mfix-esp32-psram-cache-strategy=nops" APPEND)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Check toolchain is configured properly in cmake
|
# Check toolchain is configured properly in cmake
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include "mbedtls/sha256.h"
|
#include "mbedtls/sha256.h"
|
||||||
#include "mbedtls/sha512.h"
|
#include "mbedtls/sha512.h"
|
||||||
#include "esp32/sha.h"
|
#include "esp32/sha.h"
|
||||||
|
#include "ccomp_timer.h"
|
||||||
|
|
||||||
/* Note: Most of the SHA functions are called as part of mbedTLS, so
|
/* Note: Most of the SHA functions are called as part of mbedTLS, so
|
||||||
are tested as part of mbedTLS tests. Only esp_sha() is different.
|
are tested as part of mbedTLS tests. Only esp_sha() is different.
|
||||||
|
@ -25,7 +26,7 @@ TEST_CASE("Test esp_sha()", "[hw_crypto]")
|
||||||
{
|
{
|
||||||
const size_t BUFFER_SZ = 32 * 1024 + 6; // NB: not an exact multiple of SHA block size
|
const size_t BUFFER_SZ = 32 * 1024 + 6; // NB: not an exact multiple of SHA block size
|
||||||
|
|
||||||
int64_t begin, end;
|
int64_t elapsed;
|
||||||
uint32_t us_sha1, us_sha512;
|
uint32_t us_sha1, us_sha512;
|
||||||
uint8_t sha1_result[20] = { 0 };
|
uint8_t sha1_result[20] = { 0 };
|
||||||
uint8_t sha512_result[64] = { 0 };
|
uint8_t sha512_result[64] = { 0 };
|
||||||
|
@ -45,19 +46,19 @@ TEST_CASE("Test esp_sha()", "[hw_crypto]")
|
||||||
0x1e, 0x07, 0xc6, 0xa2, 0x9e, 0x3b, 0x65, 0x75,
|
0x1e, 0x07, 0xc6, 0xa2, 0x9e, 0x3b, 0x65, 0x75,
|
||||||
0x80, 0x7d, 0xe6, 0x6e, 0x47, 0x61, 0x2c, 0x94 };
|
0x80, 0x7d, 0xe6, 0x6e, 0x47, 0x61, 0x2c, 0x94 };
|
||||||
|
|
||||||
begin = esp_timer_get_time();
|
ccomp_timer_start();
|
||||||
esp_sha(SHA1, buffer, BUFFER_SZ, sha1_result);
|
esp_sha(SHA1, buffer, BUFFER_SZ, sha1_result);
|
||||||
end = esp_timer_get_time();
|
elapsed = ccomp_timer_stop();
|
||||||
TEST_ASSERT_EQUAL_HEX8_ARRAY(sha1_expected, sha1_result, sizeof(sha1_expected));
|
TEST_ASSERT_EQUAL_HEX8_ARRAY(sha1_expected, sha1_result, sizeof(sha1_expected));
|
||||||
us_sha1 = end - begin;
|
us_sha1 = elapsed;
|
||||||
ESP_LOGI(TAG, "esp_sha() 32KB SHA1 in %u us", us_sha1);
|
ESP_LOGI(TAG, "esp_sha() 32KB SHA1 in %u us", us_sha1);
|
||||||
|
|
||||||
begin = esp_timer_get_time();
|
ccomp_timer_start();
|
||||||
esp_sha(SHA2_512, buffer, BUFFER_SZ, sha512_result);
|
esp_sha(SHA2_512, buffer, BUFFER_SZ, sha512_result);
|
||||||
end = esp_timer_get_time();
|
elapsed = ccomp_timer_stop();
|
||||||
TEST_ASSERT_EQUAL_HEX8_ARRAY(sha512_expected, sha512_result, sizeof(sha512_expected));
|
TEST_ASSERT_EQUAL_HEX8_ARRAY(sha512_expected, sha512_result, sizeof(sha512_expected));
|
||||||
|
|
||||||
us_sha512 = end - begin;
|
us_sha512 = elapsed;
|
||||||
ESP_LOGI(TAG, "esp_sha() 32KB SHA512 in %u us", us_sha512);
|
ESP_LOGI(TAG, "esp_sha() 32KB SHA512 in %u us", us_sha512);
|
||||||
|
|
||||||
free(buffer);
|
free(buffer);
|
||||||
|
|
|
@ -133,6 +133,12 @@ typedef unsigned portBASE_TYPE UBaseType_t;
|
||||||
#include "sdkconfig.h"
|
#include "sdkconfig.h"
|
||||||
#include "esp_attr.h"
|
#include "esp_attr.h"
|
||||||
|
|
||||||
|
#ifdef CONFIG_SPIRAM_WORKAROUND_NEED_VOLATILE_SPINLOCK
|
||||||
|
#define NEED_VOLATILE_MUX volatile
|
||||||
|
#else
|
||||||
|
#define NEED_VOLATILE_MUX
|
||||||
|
#endif
|
||||||
|
|
||||||
/* "mux" data structure (spinlock) */
|
/* "mux" data structure (spinlock) */
|
||||||
typedef struct {
|
typedef struct {
|
||||||
/* owner field values:
|
/* owner field values:
|
||||||
|
@ -146,12 +152,12 @@ typedef struct {
|
||||||
*
|
*
|
||||||
* Any value other than portMUX_FREE_VAL, CORE_ID_REGVAL_PRO, CORE_ID_REGVAL_APP indicates corruption
|
* Any value other than portMUX_FREE_VAL, CORE_ID_REGVAL_PRO, CORE_ID_REGVAL_APP indicates corruption
|
||||||
*/
|
*/
|
||||||
uint32_t owner;
|
NEED_VOLATILE_MUX uint32_t owner;
|
||||||
/* count field:
|
/* count field:
|
||||||
* If mux is unlocked, count should be zero.
|
* If mux is unlocked, count should be zero.
|
||||||
* If mux is locked, count is non-zero & represents the number of recursive locks on the mux.
|
* If mux is locked, count is non-zero & represents the number of recursive locks on the mux.
|
||||||
*/
|
*/
|
||||||
uint32_t count;
|
NEED_VOLATILE_MUX uint32_t count;
|
||||||
#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG
|
#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG
|
||||||
const char *lastLockedFn;
|
const char *lastLockedFn;
|
||||||
int lastLockedLine;
|
int lastLockedLine;
|
||||||
|
|
|
@ -38,8 +38,8 @@
|
||||||
#define IDF_PERFORMANCE_MAX_ISR_ENTER_CYCLES 290
|
#define IDF_PERFORMANCE_MAX_ISR_ENTER_CYCLES 290
|
||||||
#define IDF_PERFORMANCE_MAX_ISR_EXIT_CYCLES 565
|
#define IDF_PERFORMANCE_MAX_ISR_EXIT_CYCLES 565
|
||||||
|
|
||||||
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_4BIT 12500
|
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_4BIT 12200
|
||||||
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_FRHOST_4BIT 12500
|
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_FRHOST_4BIT 12200
|
||||||
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_1BIT 4000
|
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_1BIT 4000
|
||||||
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_FRHOST_1BIT 4000
|
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_FRHOST_1BIT 4000
|
||||||
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_SPI 1000
|
#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_MBSEC_TOHOST_SPI 1000
|
||||||
|
|
|
@ -132,6 +132,7 @@ menu "mbedTLS"
|
||||||
config MBEDTLS_HARDWARE_AES
|
config MBEDTLS_HARDWARE_AES
|
||||||
bool "Enable hardware AES acceleration"
|
bool "Enable hardware AES acceleration"
|
||||||
default y
|
default y
|
||||||
|
depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
|
||||||
help
|
help
|
||||||
Enable hardware accelerated AES encryption & decryption.
|
Enable hardware accelerated AES encryption & decryption.
|
||||||
|
|
||||||
|
@ -141,6 +142,7 @@ menu "mbedTLS"
|
||||||
config MBEDTLS_HARDWARE_MPI
|
config MBEDTLS_HARDWARE_MPI
|
||||||
bool "Enable hardware MPI (bignum) acceleration"
|
bool "Enable hardware MPI (bignum) acceleration"
|
||||||
default y
|
default y
|
||||||
|
depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
|
||||||
help
|
help
|
||||||
Enable hardware accelerated multiple precision integer operations.
|
Enable hardware accelerated multiple precision integer operations.
|
||||||
|
|
||||||
|
@ -152,6 +154,7 @@ menu "mbedTLS"
|
||||||
config MBEDTLS_HARDWARE_SHA
|
config MBEDTLS_HARDWARE_SHA
|
||||||
bool "Enable hardware SHA acceleration"
|
bool "Enable hardware SHA acceleration"
|
||||||
default y
|
default y
|
||||||
|
depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
|
||||||
help
|
help
|
||||||
Enable hardware accelerated SHA1, SHA256, SHA384 & SHA512 in mbedTLS.
|
Enable hardware accelerated SHA1, SHA256, SHA384 & SHA512 in mbedTLS.
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ idf_component_register(SRCS "${srcs}"
|
||||||
|
|
||||||
# Toolchain libraries require code defined in this component
|
# Toolchain libraries require code defined in this component
|
||||||
idf_component_get_property(newlib newlib COMPONENT_LIB)
|
idf_component_get_property(newlib newlib COMPONENT_LIB)
|
||||||
target_link_libraries(${COMPONENT_LIB} INTERFACE ${LIBC} ${LIBM} gcc "$<TARGET_FILE:${newlib}>")
|
target_link_libraries(${COMPONENT_LIB} INTERFACE c m gcc "$<TARGET_FILE:${newlib}>")
|
||||||
|
|
||||||
set_source_files_properties(heap.c PROPERTIES COMPILE_FLAGS -fno-builtin)
|
set_source_files_properties(heap.c PROPERTIES COMPILE_FLAGS -fno-builtin)
|
||||||
|
|
||||||
|
@ -40,3 +40,7 @@ list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_heap_impl")
|
||||||
list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_syscalls_impl")
|
list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_syscalls_impl")
|
||||||
list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_pthread_impl")
|
list(APPEND EXTRA_LINK_FLAGS "-u newlib_include_pthread_impl")
|
||||||
target_link_libraries(${COMPONENT_LIB} INTERFACE "${EXTRA_LINK_FLAGS}")
|
target_link_libraries(${COMPONENT_LIB} INTERFACE "${EXTRA_LINK_FLAGS}")
|
||||||
|
|
||||||
|
if(CONFIG_NEWLIB_NANO_FORMAT)
|
||||||
|
target_link_libraries(${COMPONENT_LIB} INTERFACE "--specs=nano.specs")
|
||||||
|
endif()
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
if(CONFIG_NEWLIB_NANO_FORMAT)
|
|
||||||
set(LIBC c_nano)
|
|
||||||
else()
|
|
||||||
set(LIBC c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(LIBM m)
|
|
|
@ -444,6 +444,21 @@ function run_tests()
|
||||||
grep -q '"command"' build/compile_commands.json || failure "compile_commands.json missing or has no no 'commands' in it"
|
grep -q '"command"' build/compile_commands.json || failure "compile_commands.json missing or has no no 'commands' in it"
|
||||||
(grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-issue) && failure "All commands in compile_commands.json should use PSRAM cache workaround"
|
(grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-issue) && failure "All commands in compile_commands.json should use PSRAM cache workaround"
|
||||||
rm -r build
|
rm -r build
|
||||||
|
#Test for various strategies
|
||||||
|
for strat in MEMW NOPS DUPLDST; do
|
||||||
|
rm -r build sdkconfig.defaults sdkconfig sdkconfig.defaults.esp32
|
||||||
|
stratlc=`echo $strat | tr A-Z a-z`
|
||||||
|
mkdir build && touch build/sdkconfig
|
||||||
|
echo "CONFIG_ESP32_SPIRAM_SUPPORT=y" > sdkconfig.defaults
|
||||||
|
echo "CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_$strat=y" >> sdkconfig.defaults
|
||||||
|
echo "CONFIG_SPIRAM_CACHE_WORKAROUND=y" >> sdkconfig.defaults
|
||||||
|
# note: we do 'reconfigure' here, as we just need to run cmake
|
||||||
|
idf.py reconfigure
|
||||||
|
grep -q '"command"' build/compile_commands.json || failure "compile_commands.json missing or has no no 'commands' in it"
|
||||||
|
(grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-strategy=$stratlc) && failure "All commands in compile_commands.json should use PSRAM cache workaround strategy $strat when selected"
|
||||||
|
echo ${PWD}
|
||||||
|
rm -r sdkconfig.defaults build
|
||||||
|
done
|
||||||
|
|
||||||
print_status "Displays partition table when executing target partition_table"
|
print_status "Displays partition table when executing target partition_table"
|
||||||
idf.py partition_table | grep -E "# Espressif .+ Partition Table"
|
idf.py partition_table | grep -E "# Espressif .+ Partition Table"
|
||||||
|
|
|
@ -72,7 +72,7 @@ class TestUsage(unittest.TestCase):
|
||||||
idf_tools.main(['list'])
|
idf_tools.main(['list'])
|
||||||
output = output_stream.getvalue()
|
output = output_stream.getvalue()
|
||||||
|
|
||||||
xtensa_esp32_elf_version = 'esp-2019r2-8.2.0'
|
xtensa_esp32_elf_version = 'esp-2020r2-8.2.0'
|
||||||
esp32ulp_version = '2.28.51-esp-20191205'
|
esp32ulp_version = '2.28.51-esp-20191205'
|
||||||
|
|
||||||
self.assertIn('* xtensa-esp32-elf:', output)
|
self.assertIn('* xtensa-esp32-elf:', output)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp-2019r2
|
SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp-2020r2
|
||||||
SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 8.2.0
|
SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 8.2.0
|
||||||
|
|
||||||
CURRENT_TOOLCHAIN_COMMIT_DESC = esp-2019r2
|
CURRENT_TOOLCHAIN_COMMIT_DESC = esp-2020r2
|
||||||
CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp-2019r2
|
CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp-2020r2
|
||||||
CURRENT_TOOLCHAIN_GCC_VERSION = 8.2.0
|
CURRENT_TOOLCHAIN_GCC_VERSION = 8.2.0
|
||||||
|
|
|
@ -22,36 +22,36 @@
|
||||||
"versions": [
|
"versions": [
|
||||||
{
|
{
|
||||||
"linux-amd64": {
|
"linux-amd64": {
|
||||||
"sha256": "e6d47c1dbd8c8cbfe37271e5e2aac53ee88c9e347ae937e22bf0c73f530efbdf",
|
"sha256": "6c73b9e9d252810a63ca5e94b497c6c09fb8c903fe9c477f385bdc2ab4d2187e",
|
||||||
"size": 85459985,
|
"size": 85520229,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-amd64.tar.gz"
|
||||||
},
|
},
|
||||||
"linux-armel": {
|
"linux-armel": {
|
||||||
"sha256": "54a199c28f591da2466b21741911bc2ba77ddf82d3d2b66c6ce03c1a0c6835f0",
|
"sha256": "51dd318c4f2ac1fe2b206d029e1d2080c922107cc56e4a3802b1acafd7b436db",
|
||||||
"size": 83647538,
|
"size": 83672167,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-armel.tar.gz"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-armel.tar.gz"
|
||||||
},
|
},
|
||||||
"linux-i686": {
|
"linux-i686": {
|
||||||
"sha256": "36a9648c414dbd1c518c687ce5587d9f8eaa94324f45d92e9ec31a1433a04df8",
|
"sha256": "a003c7bc9b9f0dd82170480aadd62c0586fc6e3d69119c637c957125164f40e5",
|
||||||
"size": 87438500,
|
"size": 87467927,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-i686.tar.gz"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-i686.tar.gz"
|
||||||
},
|
},
|
||||||
"macos": {
|
"macos": {
|
||||||
"sha256": "dc62be8dd16c6d9d28d64e2b3f831fa208f3548c2ca73cdbcbdf68f474d59521",
|
"sha256": "48b288e3e5c60623851616bf545b8e4fc5382dc980d6b9682373f11013fe5776",
|
||||||
"size": 92150978,
|
"size": 92201363,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-macos.tar.gz"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-macos.tar.gz"
|
||||||
},
|
},
|
||||||
"name": "esp-2019r2-8.2.0",
|
"name": "esp-2020r2-8.2.0",
|
||||||
"status": "recommended",
|
"status": "recommended",
|
||||||
"win32": {
|
"win32": {
|
||||||
"sha256": "c9d5776a22516f0825a7c68d835ffacc2392f913136893b7646e1288937cc65e",
|
"sha256": "f2ba6bdb1c4b2178955e5e7a204552bb754709e02eaf9d8febe770d46629db8f",
|
||||||
"size": 103850448,
|
"size": 103885422,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-win32.zip"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-win32.zip"
|
||||||
},
|
},
|
||||||
"win64": {
|
"win64": {
|
||||||
"sha256": "c9d5776a22516f0825a7c68d835ffacc2392f913136893b7646e1288937cc65e",
|
"sha256": "036ae8c737e7a4ced7121881f10747cf7b18914648ef611c78b3d543a0f00d8f",
|
||||||
"size": 103850448,
|
"size": 106505186,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-win32.zip"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-win64.zip"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -78,36 +78,36 @@
|
||||||
"versions": [
|
"versions": [
|
||||||
{
|
{
|
||||||
"linux-amd64": {
|
"linux-amd64": {
|
||||||
"sha256": "59c6951e39937b9dfa53cca6d7707984ee39572071e56d11069f032d079477f5",
|
"sha256": "f5efd18a96f773b73bd6bcdee4476b5e4fbccea6befe0cb62c08675e4c68a65f",
|
||||||
"size": 85762044,
|
"size": 85796525,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-amd64.tar.gz"
|
||||||
},
|
},
|
||||||
"linux-armel": {
|
"linux-armel": {
|
||||||
"sha256": "92d80cf640db34913b91c1d8dae1632a7f5a740b5dcf39a3bea750b5dba05caa",
|
"sha256": "40ed8c365a3e32643c7fc9cf44908fb166d3acc52754ebf0b03e82122a0ecd2c",
|
||||||
"size": 84036647,
|
"size": 84041933,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-linux-armel.tar.gz"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-armel.tar.gz"
|
||||||
},
|
},
|
||||||
"linux-i686": {
|
"linux-i686": {
|
||||||
"sha256": "d31c39dce8e6faa36807152a8afa8fe79d491bc551ad27dff1fed2f31dd6a39e",
|
"sha256": "53e8b9d38c409a207685b615924eada2ee9719ac4fe8c79caa7a89c788a65a7d",
|
||||||
"size": 87755342,
|
"size": 87773410,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-linux-i686.tar.gz"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-i686.tar.gz"
|
||||||
},
|
},
|
||||||
"macos": {
|
"macos": {
|
||||||
"sha256": "01f6d9b6d25a550975a16d2634a577a0c0f3c3c24db10edd1b714f9c192f490d",
|
"sha256": "76d17b170e667b73dbb013e8efa8032b18d9e68f6e364745639e851d99ad68a3",
|
||||||
"size": 92535775,
|
"size": 92562690,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-macos.tar.gz"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-macos.tar.gz"
|
||||||
},
|
},
|
||||||
"name": "esp-2019r2-8.2.0",
|
"name": "esp-2020r2-8.2.0",
|
||||||
"status": "recommended",
|
"status": "recommended",
|
||||||
"win32": {
|
"win32": {
|
||||||
"sha256": "f9b69732bd4e90d4558547f6a2d33f78433971e9e4f04968515cf460ea6de79a",
|
"sha256": "e7fe06fc37f1046765653ec1ed571f06a86a5b5cde7b3a0ab71c44232c5b6a2f",
|
||||||
"size": 104254613,
|
"size": 104302935,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-win32.zip"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-win32.zip"
|
||||||
},
|
},
|
||||||
"win64": {
|
"win64": {
|
||||||
"sha256": "f9b69732bd4e90d4558547f6a2d33f78433971e9e4f04968515cf460ea6de79a",
|
"sha256": "56b450ab9fa6c10e2d7defbf903af9c1594e9b86fece89faf5071d6461e07111",
|
||||||
"size": 104254613,
|
"size": 106864587,
|
||||||
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2019r2-win32.zip"
|
"url": "https://dl.espressif.com/dl/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-win64.zip"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -42,7 +42,7 @@ if [ -n "$IDF_PATH" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/
|
# Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/
|
||||||
TOOLCHAIN_ZIP=xtensa-esp32-elf-gcc8_2_0-esp-2019r2-win32.zip
|
TOOLCHAIN_ZIP=xtensa-esp32-elf-gcc8_2_0-esp-2020r2-win32.zip
|
||||||
echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
|
echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
|
||||||
cd ~
|
cd ~
|
||||||
curl -LO --retry 10 https://dl.espressif.com/dl/${TOOLCHAIN_ZIP}
|
curl -LO --retry 10 https://dl.espressif.com/dl/${TOOLCHAIN_ZIP}
|
||||||
|
|
Loading…
Reference in a new issue