diff --git a/examples/Makefile-efr32 b/examples/Makefile-efr32 index 9a6d7a76b..7893fdb10 100644 --- a/examples/Makefile-efr32 +++ b/examples/Makefile-efr32 @@ -79,11 +79,11 @@ EFR32_MBEDTLS_CPPFLAGS = -DMBEDTLS_CONFIG_FILE='\"mbedtls-config.h\"' EFR32_MBEDTLS_CPPFLAGS += -DMBEDTLS_USER_CONFIG_FILE='\"efr32-mbedtls-config.h\"' EFR32_MBEDTLS_CPPFLAGS += -D$(MCU) EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/examples/platforms/efr32/crypto -EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.2/util/third_party/mbedtls/configs -EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.2/platform/CMSIS/Include -EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.2/util/third_party/mbedtls/sl_crypto/include -EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.2/platform/Device/SiliconLabs/EFR32MG12P/Include -EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/inc +EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/configs +EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.3/platform/CMSIS/Include +EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/include +EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.3/platform/Device/SiliconLabs/EFR32MG12P/Include +EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/inc EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo/include EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo/include/mbedtls diff --git a/examples/platforms/efr32/Makefile.am b/examples/platforms/efr32/Makefile.am index de4a7645a..476ab45d5 100644 --- a/examples/platforms/efr32/Makefile.am +++ b/examples/platforms/efr32/Makefile.am @@ -38,7 +38,7 @@ override CXXFLAGS := $(filter-out -Wconversion,$(CXXF override CFLAGS := $(filter-out -pedantic-errors,$(CFLAGS)) override CXXFLAGS := $(filter-out -pedantic-errors,$(CXXFLAGS)) -EFR32MG_SDK_SRCDIR = $(top_srcdir)/third_party/silabs/gecko_sdk_suite/v2.2 +EFR32MG_SDK_SRCDIR = $(top_srcdir)/third_party/silabs/gecko_sdk_suite/v2.3 libopenthread_efr32_a_CPPFLAGS = \ -D__START=main \ @@ -86,33 +86,33 @@ PLATFORM_SOURCES = $(NULL) nodist_libopenthread_efr32_a_SOURCES = \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/hardware/kit/common/bsp/bsp_bcc.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/hardware/kit/common/bsp/bsp_init.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/hardware/kit/common/bsp/bsp_stk.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/hardware/kit/common/bsp/bsp_stk_leds.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/Device/SiliconLabs/EFR32MG12P/Source/system_efr32mg12p.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/Device/SiliconLabs/EFR32MG12P/Source/GCC/startup_efr32mg12p.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emdrv/dmadrv/src/dmadrv.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emdrv/gpiointerrupt/src/gpiointerrupt.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emdrv/rtcdrv/src/rtcdriver.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emdrv/uartdrv/src/uartdrv.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emdrv/ustimer/src/ustimer.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_adc.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_cmu.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_core.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_crypto.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_emu.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_gpio.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_ldma.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_leuart.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_msc.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_rmu.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_rtcc.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_system.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_timer.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/emlib/src/em_usart.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/radio/rail_lib/hal/efr32/hal_efr.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/platform/radio/rail_lib/hal/hal_common.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/hardware/kit/common/bsp/bsp_bcc.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/hardware/kit/common/bsp/bsp_init.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/hardware/kit/common/bsp/bsp_stk.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/hardware/kit/common/bsp/bsp_stk_leds.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/Device/SiliconLabs/EFR32MG12P/Source/system_efr32mg12p.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/Device/SiliconLabs/EFR32MG12P/Source/GCC/startup_efr32mg12p.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emdrv/dmadrv/src/dmadrv.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emdrv/gpiointerrupt/src/gpiointerrupt.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emdrv/rtcdrv/src/rtcdriver.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emdrv/uartdrv/src/uartdrv.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emdrv/ustimer/src/ustimer.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_adc.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_cmu.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_core.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_crypto.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_emu.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_gpio.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_ldma.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_leuart.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_msc.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_rmu.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_rtcc.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_system.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_timer.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_usart.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/radio/rail_lib/hal/efr32/hal_efr.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/radio/rail_lib/hal/hal_common.c \ $(NULL) noinst_HEADERS = \ diff --git a/examples/platforms/efr32/Makefile.platform.am b/examples/platforms/efr32/Makefile.platform.am index 4cdb93e14..971c3b180 100644 --- a/examples/platforms/efr32/Makefile.platform.am +++ b/examples/platforms/efr32/Makefile.platform.am @@ -32,9 +32,9 @@ LDADD_COMMON += \ $(top_builddir)/examples/platforms/efr32/libopenthread-efr32.a \ - $(top_srcdir)/third_party/silabs/gecko_sdk_suite/v2.2/platform/radio/rail_lib/autogen/librail_release/librail_efr32xg12_gcc_release.a \ + $(top_srcdir)/third_party/silabs/gecko_sdk_suite/v2.3/platform/radio/rail_lib/autogen/librail_release/librail_efr32xg12_gcc_release.a \ $(NULL) LDFLAGS_COMMON += \ - -T $(top_srcdir)/third_party/silabs/gecko_sdk_suite/v2.2/platform/Device/SiliconLabs/EFR32MG12P/Source/GCC/efr32mg12p.ld \ + -T $(top_srcdir)/third_party/silabs/gecko_sdk_suite/v2.3/platform/Device/SiliconLabs/EFR32MG12P/Source/GCC/efr32mg12p.ld \ $(NULL) diff --git a/examples/platforms/efr32/fem-control.c b/examples/platforms/efr32/fem-control.c index fa8c91697..352a4fc9f 100644 --- a/examples/platforms/efr32/fem-control.c +++ b/examples/platforms/efr32/fem-control.c @@ -29,5 +29,5 @@ #include "hal-config.h" #if (HAL_FEM_ENABLE) -#include "../../../third_party/silabs/gecko_sdk_suite/v2.2/util/plugin/plugin-common/fem-control/fem-control.c" +#include "../../../third_party/silabs/gecko_sdk_suite/v2.3/util/plugin/plugin-common/fem-control/fem-control.c" #endif diff --git a/third_party/mbedtls/Makefile.am b/third_party/mbedtls/Makefile.am index ae34b508d..7c099cdec 100644 --- a/third_party/mbedtls/Makefile.am +++ b/third_party/mbedtls/Makefile.am @@ -50,8 +50,8 @@ libmbedcrypto_a_SOURCES = \ if OPENTHREAD_EXAMPLES_EFR32 nodist_libmbedcrypto_a_SOURCES = \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/util/third_party/mbedtls/sl_crypto/src/crypto_aes.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/util/third_party/mbedtls/sl_crypto/src/crypto_management.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_aes.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_management.c \ $(NULL) else libmbedcrypto_a_SOURCES += \ @@ -92,8 +92,8 @@ libmbedcrypto_a_SOURCES += \ if OPENTHREAD_EXAMPLES_EFR32 nodist_libmbedcrypto_a_SOURCES += \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/util/third_party/mbedtls/library/ecp.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.2/util/third_party/mbedtls/sl_crypto/src/crypto_ecp.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/library/ecp.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_ecp.c \ $(NULL) else libmbedcrypto_a_SOURCES += \