Merge pull request #1771 from aws/release-candidate

Merging release-candidate to release

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a bug report for Amazon FreeRTOS
+about: Create a bug report for FreeRTOS
 labels: bug
 
 ---
@@ -12,7 +12,7 @@ A clear and concise description of what the bug is.
 - Which hardware board or part numbers?
 - IDE used
 - Operating System [Windows|Linux|MacOS]
-- Version of Amazon FreeRTOS (run ``git describe --tags`` to find it)
+- Version of FreeRTOS (run ``git describe --tags`` to find it)
 - Project [Custom Application|MQTT|Shadow|Greengrass|OTA|Device Defender|TCP Echo|Sub pub Demo|Simple TCP Server]
 - If your project is a Custom Application, please add the relevant code snippet in the section `Code to reproduce the bug`. 
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for Amazon FreeRTOS
+about: Suggest an idea for FreeRTOS
 labels: feature request
 
 ---

.gitmodules

@@ -9,7 +9,6 @@
 [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

CHANGELOG.md

@@ -1,4 +1,21 @@
-# Change Log for Amazon FreeRTOS
+# Change Log for FreeRTOS
+
+## 202002.00 2/18/2020
+
+### New Features
+
+#### FreeRTOS kernel V10.3.0
+- Includes FreeRTOS kernel V10.3.0
+- Additional details can be found here: https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/V10.3.0-kernel-only/History.txt
+
+#### Product Name Change
+- The name 'Amazon FreeRTOS' has been changed to 'FreeRTOS'
+- The name 'Amazon FreeRTOS Qualification (AFQ)' has been changed to 'Device Qualification Program for FreeRTOS'
+- Changes were applied only to comments and headers
+
+### Updates
+### Cmake
+- Fix a dependency parsing bug in CMake
 
 ## 201912.00 12/17/2019
 

CMakeLists.txt

@@ -6,8 +6,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 endif()
 
 project(amazon-freertos)
-set(PROJECT_VERSION "201912.00")
-set(PROJECT_VERSION_MAJOR "201912")
+set(PROJECT_VERSION "202002.00")
+set(PROJECT_VERSION_MAJOR "202002")
 set(PROJECT_VERSION_MINOR "00")
 
 # Import global configurations.
@@ -49,7 +49,7 @@ endif()
 include("${AFR_BOARD_PATH}/CMakeLists.txt")
 
 # -------------------------------------------------------------------------------------------------
-# Amazon FreeRTOS modules
+# FreeRTOS modules
 # -------------------------------------------------------------------------------------------------
 # Do not prefix the output library file.
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
@@ -67,7 +67,7 @@ afr_resolve_dependencies()
 # Summary
 # -------------------------------------------------------------------------------------------------
 afr_status("")
-afr_status("====================Configuration for Amazon FreeRTOS====================")
+afr_status("====================Configuration for FreeRTOS====================")
 afr_status("  Version:                 " "${AFR_VERSION}")
 afr_status("  Git version:             " "${AFR_VERSION_VCS}")
 
@@ -98,9 +98,9 @@ afr_status("  Toolchain:               " "${AFR_TOOLCHAIN}")
 afr_status("  Toolchain path:          " "${CMAKE_FIND_ROOT_PATH}")
 afr_status("  CMake generator:         " "${CMAKE_GENERATOR}")
 
-# ================ Amazon FreeRTOS modules ================
+# ================ FreeRTOS modules ================
 afr_status("")
-afr_status("Amazon FreeRTOS modules:")
+afr_status("FreeRTOS modules:")
 
 afr_status("  Modules to build:        " "${AFR_MODULES_BUILD}")
 afr_status("  Enabled by user:         " "${AFR_MODULES_ENABLED_USER}")

README.md

@@ -25,17 +25,17 @@ 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).
+For more information on FreeRTOS, refer to the [Getting Started section of FreeRTOS webpage](https://aws.amazon.com/freertos).
 
 To directly access the **Getting Started Guide** for supported hardware platforms, click the corresponding link in the Supported Hardware section below.
 
-For detailed documentation on Amazon FreeRTOS, refer to the [Amazon FreeRTOS User Guide](https://aws.amazon.com/documentation/freertos).
+For detailed documentation on FreeRTOS, refer to the [FreeRTOS User Guide](https://aws.amazon.com/documentation/freertos).
 
 ## Supported Hardware
 
-For additional boards that are supported for Amazon FreeRTOS, please visit the [AWS Device Catalog](https://devices.amazonaws.com/search?kw=freertos)
+For additional boards that are supported for FreeRTOS, please visit the [AWS Device Catalog](https://devices.amazonaws.com/search?kw=freertos)
 
-The following MCU boards are supported for Amazon FreeRTOS:
+The following MCU boards are supported for FreeRTOS:
 1. **Texas Instruments** - [CC3220SF-LAUNCHXL](http://www.ti.com/tool/cc3220sf-launchxl).
     * [Getting Started Guide](https://docs.aws.amazon.com/freertos/latest/userguide/getting_started_ti.html)
     * IDEs: [Code Composer Studio](http://www.ti.com/tools-software/ccs.html), [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/partners/texas-instruments)
@@ -76,7 +76,7 @@ The following MCU boards are supported for Amazon FreeRTOS:
     * [Getting Started Guide](https://docs.aws.amazon.com/freertos/latest/userguide/getting_started_nordic.html)  
 15. **Nuvoton** - [NuMaker-IoT-M487](https://direct.nuvoton.com/en/numaker-iot-m487)
     * [Getting Started Guide](https://docs.aws.amazon.com/freertos/latest/userguide/getting-started-nuvoton-m487.html)
-16. **Windows Simulator** - To evaluate Amazon FreeRTOS without using MCU-based hardware, you can use the Windows Simulator.
+16. **Windows Simulator** - To evaluate FreeRTOS without using MCU-based hardware, you can use the Windows Simulator.
     * Requirements: Microsoft Windows 7 or newer, with at least a dual core and a hard-wired Ethernet connection
     * [Getting Started Guide](https://docs.aws.amazon.com/freertos/latest/userguide/getting_started_windows.html)
     * IDE: [Visual Studio Community Edition](https://www.visualstudio.com/downloads/)