Merge pull request #1475 from aws/release-candidate

Release candidate merge for 201910.00

.gitmodules

@@ -0,0 +1,16 @@
+[submodule "http-parser"]
+	path = libraries/3rdparty/http_parser
+	url = https://github.com/nodejs/http-parser.git
+	branch = v2.9.2
+[submodule "unity"]
+	path = libraries/3rdparty/unity
+	url = https://github.com/ThrowTheSwitch/Unity.git
+	branch = v2.4.3
+[submodule "freertos_kernel"]
+	path = freertos_kernel
+	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
+	branch = V10.2.1-convergence-FreeRTOS-Source
+[submodule "pkcs11"]
+	path = libraries/3rdparty/pkcs11
+	url = https://github.com/amazon-freertos/pkcs11.git
+	branch = v2.40_errata01

CHANGELOG.md

@@ -1,5 +1,51 @@
 # Change Log for Amazon FreeRTOS
 
+## 201910.00 10/29/2019
+
+### New Features
+#### New Board: Infineon XMC4800 IoT Connectivity Kit with OPTIGA Trust X
+- The Infineon XMC4800 IoT Connectivity Kit with OPTIGA Trust X secure element is now qualified for Amazon FreeRTOS.
+
+#### New Board: Microchip ATECC608A with Windows Simulator
+- The Microchip ATECC608A secure element with Windows Simulator is now qualified for Amazon FreeRTOS.
+
+#### Defender Client Library V3.0.0
+- Defender Library API change to shared MQTT connection.
+- Demonstration code for Defender Library updated to show use of shared connection.
+
+#### HTTPS Client Library V1.1.0
+- Upload support with HTTP methods PUT and POST is now available in the HTTPS Client Library.
+- Demonstration code with PUT and POST methods are now available in demos/https. 
+
+#### SoftHSMv2 port for PKCS #11
+- A port for SoftHSMv2, a third-party open-source implementation of PKCS #11, has been provided for use with the Windows Simulator project for Amazon FreeRTOS.
+- The purpose of the SoftHSMv2 port is to allow ad hoc interoperability testing with an independent implementation of the PKCS #11 standard.
+
+#### CMake Builds
+- CMake build is now supported for Nordic nRF52840 DK Development kit.
+
+### Updates
+#### FreeRTOS Kernel
+- FreeRTOS kernel is now a submodule from https://github.com/FreeRTOS/FreeRTOS-Kernel.git
+
+#### HTTP Parser
+- Add nodejs/http_parser as a submodule in place of copied-over files.
+
+#### Unity
+- Add ThrowTheSwitch/Unity as a submodule in place of copied-over files. 
+
+#### PKCS #11
+- Update the PKCS #11 third-party headers to be the latest from OASIS (version 2.40 Plus Errata 01).
+- Add PKCS #11 as a submodule.
+
+#### Bluetooth Low Energy
+- ESP32 board supports NIMBLE as the default underlying stack for Bluetooth Low Energy.
+- Contains bug fixes and enhancements in ESP NIMBLE stack.
+- Contains bug fixes in ESP Bluedroid stack.
+
+#### Marvell SDK Update
+- Marvell SDK now updated to R8 P2 (v1.2.r8.p2)
+
 ## 201908.00 08/26/2019
 
 ### New Features

CMakeLists.txt

@@ -6,8 +6,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 endif()
 
 project(amazon-freertos)
-set(PROJECT_VERSION "201908.00")
-set(PROJECT_VERSION_MAJOR "201908")
+set(PROJECT_VERSION "201910.00")
+set(PROJECT_VERSION_MAJOR "201910")
 set(PROJECT_VERSION_MINOR "00")
 
 # Import global configurations.
@@ -44,11 +44,16 @@ elseif(DEFINED AFR_MANIFEST_BOARD_DIR)
 else()
     message(FATAL_ERROR "Could not import board CMakeLists.txt.")
 endif()
-add_subdirectory("${AFR_BOARD_PATH}")
+# Use include here because we need portable layer targets defined by vendor to be at
+# the same directory level as our library components.
+include("${AFR_BOARD_PATH}/CMakeLists.txt")
 
 # -------------------------------------------------------------------------------------------------
 # Amazon FreeRTOS modules
 # -------------------------------------------------------------------------------------------------
+# Do not prefix the output library file.
+set(CMAKE_STATIC_LIBRARY_PREFIX "")
+
 # Initialize all modules.
 add_subdirectory("libraries")
 add_subdirectory("demos")

README.md

@@ -1,3 +1,28 @@
+## Cloning
+This repo uses [Git Submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to bring in dependent components.
+
+Note: If you download the ZIP file provided by GitHub UI, you will not get the contents of the submodules. (The ZIP file is also not a valid git repository)
+
+To clone using HTTPS:
+```
+git clone https://github.com/aws/amazon-freertos.git --recurse-submodules
+```
+Using SSH:
+```
+git clone [email protected]:aws/amazon-freertos.git --recurse-submodules
+```
+
+If you have downloaded the repo without using the `--recurse-submodules` argument, you need to run:
+```
+git submodule update --init --recursive
+```
+
+## Important branches to know
+master            --> Development is done continuously on this branch  
+release           --> Fully tested released source code  
+release-candidate --> Preview of upcoming release  
+feature/*         --> Alpha/beta of an upcoming feature  
+
 ## Getting Started
 
 For more information on Amazon FreeRTOS, refer to the [Getting Started section of Amazon FreeRTOS webpage](https://aws.amazon.com/freertos).