Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Commit 747f074

Browse files
aggargjasonpcarrollabhidixi11Jason Carrollchinglee-iot
authoredJun 17, 2022
Merge release into main (#3499)
* Updated submodule pointers for FreeRTOS-kernel and FreeRTOS-Plus-TCP. * Scrub ESP scurity incidents * Scrub marvell wifi secrets * Scrub NXP wifi secrets * Scrub network manager wifi security incidents * Added SECURITY.md file * Scrub ST wifi secrets * Scrub infineon WIFI secrets * Scrub Nuvoton WIFI secrets * Scrub WIFI WEP secret * Update TCP submodule pointer * update mbedtls to v2.28.0 * TI: update project makefile for mbedtls update & enable separate source build to avoid make error 'The command is too long' * PC: update project makefile for mbedtls update * Cypress: update project makefile for mbedtls update * Espressif: update project makefile for mbedtls update * Infineon: update project makefile for mbedtls update * Nordic: update project makefile for mbedtls update * Mediatek: update project makefile for mbedtls update * Nuvoton: update project makefile for mbedtls update * NXP: update project makefile for mbedtls update * Renesas: update project makefile for mbedtls update * ST: update project makefile for mbedtls update * Xilinx: update project makefile for mbedtls update * Fix typo in infineon driver * Fix typo in infineon driver * Remove unused driver Existing demo can't make use of the uart driver due to no wifi interface implementation. * Scrub TI WIFI secrets * Remove default SSL offloading in ST * TI: fix aws_tests * Microchip: fix project makefile for mbedtls update * Renesas: fix aws_tests project makefile * Updated CHANGELOG.md to describe the changes being made for the 202203.00 release * Move copy WIFI secrets just right before set config * Move copy WIFI secrets * Remove sensitive log * ST: enlarge iot_thread/HTTP/MQTT Agent tasks' stack size to resolve stack overflow * Updated checksums. * Update versioning to 202203.00 * Revert "Remove default SSL offloading in ST" This reverts commit 3440f1e. * Revert "ST: enlarge iot_thread/HTTP/MQTT Agent tasks' stack size to resolve stack overflow" This reverts commit 06b1a10. * Update comment for prvMemZero function * Updated CHANGELOG.md to have Changelog instead of Change Log as the header. * Updated checksums.json. * Fix formatting check Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com> Co-authored-by: jasonpcarroll <23126711+jasonpcarroll@users.noreply.github.com> Co-authored-by: abhidixi11 <44424462+abhidixi11@users.noreply.github.com> Co-authored-by: Jason Carroll <czjaso@amazon.com> Co-authored-by: Ching-Hsin Lee <chinglee@amazon.com> Co-authored-by: Walling <wallit@88665a51e107.ant.amazon.com> Co-authored-by: Aniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com> Co-authored-by: ActoryOu <ousc@amazon.com> Co-authored-by: Ravishankar Bhagavandas <bhagavar@amazon.com>
1 parent 8e69ca7 commit 747f074

File tree

194 files changed

+25056
-17711
lines changed

Some content is hidden

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

194 files changed

+25056
-17711
lines changed
 

‎CHANGELOG.md

+32-1

‎CMakeLists.txt

+24-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,18 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
66
endif()
77

88
project(amazon-freertos)
9-
set(PROJECT_VERSION "202107.00")
10-
set(PROJECT_VERSION_MAJOR "202107")
9+
set(PROJECT_VERSION "202203.00")
10+
set(PROJECT_VERSION_MAJOR "202203")
1111
set(PROJECT_VERSION_MINOR "00")
1212

13+
# If it's TI boards, enable split mbedtls source build to
14+
# shorten the build command length to avoid "The command line is too long" error.
15+
if (AFR_BOARD STREQUAL ti.cc3220_launchpad)
16+
set(AFR_SEPARATE_MBEDTLS_SOURCE_BUILD TRUE)
17+
else()
18+
set(AFR_SEPARATE_MBEDTLS_SOURCE_BUILD FALSE)
19+
endif()
20+
1321
# Import global configurations.
1422
include("tools/cmake/afr.cmake")
1523

@@ -90,7 +98,20 @@ if( "${mbedtls_config_pos}" EQUAL "-1")
9098
-DMBEDTLS_CONFIG_FILE="aws_mbedtls_config.h"
9199
-DCONFIG_MEDTLS_USE_AFR_MEMORY
92100
)
93-
101+
102+
if (${AFR_SEPARATE_MBEDTLS_SOURCE_BUILD})
103+
target_include_directories(
104+
afr_3rdparty_mbedtls_part2
105+
PUBLIC
106+
"${AFR_3RDPARTY_DIR}/mbedtls_config"
107+
)
108+
target_compile_definitions(
109+
afr_3rdparty_mbedtls_part2
110+
PUBLIC
111+
-DMBEDTLS_CONFIG_FILE="aws_mbedtls_config.h"
112+
-DCONFIG_MEDTLS_USE_AFR_MEMORY
113+
)
114+
endif()
94115
endif()
95116

96117
# -------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)
This repository has been archived.