Merge pull request #9805 from ARMmbed/release-candidate

Release candidate for mbed-os-5.11.5

Author: 0xc0170

.github/pull_request_template.md

@@ -1,15 +1,15 @@
 ### Description
 
-<!-- 
+<!--
     Required
-    Add here detailed changes summary, testing results, dependencies 
+    Add here detailed changes summary, testing results, dependencies
     Good example: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html (Pull request template)
 -->
 
 
 ### Pull request type
 
-<!-- 
+<!--
     Required
     Please add only one X to one of the following types. Do not fill multiple types (split the pull request otherwise).
     Please note this is not a GitHub task list, indenting the boxes or changing the format to add a '.' or '*' in front
@@ -26,8 +26,15 @@
 
 ### Reviewers
 
-<!-- 
+<!--
     Optional
     Request additional reviewers with @username
 -->
 
+### Release Notes
+
+<!--
+    Optional
+    In case of breaking changes, functionality changes or refactors, please add release notes here. 
+    For more information, please see [the contributing guidelines](https://os.mbed.com/docs/mbed-os/latest/contributing   /workflow.html#pull-request-types).
+-->

LICENSE renamed to LICENSE-apache-2.0.txt

@@ -0,0 +1,22 @@
+Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license,
+as can be found in: LICENSE-apache-2.0.txt
+
+Folders containing files under different permissive license than Apache 2.0 are listed below. Each folder should contain its own README file with license specified for its files. The original license text is included in those source files.
+
+- [cmsis](./cmsis) - MIT, BSD-3-Clause
+- [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause
+- [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License
+- [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL
+- [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style
+- [features/lorawan](./features/lorawan) - Revised BSD
+- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
+- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
+- [features/storage](./features/storage) - BSD-style, MIT
+- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style
+- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
+- [features/unsupported](./features/unsupported) - MIT-style, BSD-style
+- [rtos](./rtos) - MIT
+- [drivers](./drivers) - MIT
+- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause
+- [tools/data/rpc](./tools/data/rpc) - MIT
+- [targets](./targets) - PBL, BSD-style, MIT-style, Zlib-style, Public-domain

LICENSE.md

@@ -29,9 +29,11 @@ The [release notes](https://os.mbed.com/releases) detail the current release. Yo
 
 ## License and contributions 
 
-The software is provided under [Apache-2.0 license](LICENSE). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info. 
+The software is provided under the [Apache-2.0 license](LICENSE-apache-2.0.txt). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more information.
 
-This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html)
+This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html).
+
+Folders containing files under different permissive license than Apache 2.0 are listed in the [LICENSE](LICENSE) file.
 
 ## Getting started for developers
 

README.md

@@ -29,6 +29,17 @@
 
 #include "mbed.h"
 
+// Debug available
+#ifndef FLASHIAP_DEBUG
+#define FLASHIAP_DEBUG      0
+#endif
+
+#if FLASHIAP_DEBUG
+#define DEBUG_PRINTF(...) printf(__VA_ARGS__)
+#else
+#define DEBUG_PRINTF(...)
+#endif
+
 using namespace utest::v1;
 
 
@@ -37,6 +48,21 @@ void flashiap_init_test()
     FlashIAP flash_device;
     uint32_t ret = flash_device.init();
     TEST_ASSERT_EQUAL_INT32(0, ret);
+
+    uint32_t flash_start = flash_device.get_flash_start();
+    uint32_t flash_size = flash_device.get_flash_size();
+    utest_printf("Flash address: 0x%08x, size: %d\n", flash_start, flash_size);
+    uint32_t address = flash_start;
+    int num = 0;
+    while (flash_size) {
+        uint32_t sector_size = flash_device.get_sector_size(address);
+        // Make sure all sectors sum up to the total flash size
+        TEST_ASSERT(flash_size >= sector_size);
+        DEBUG_PRINTF("\tsector %3d: address 0x%08x, size %8d\n", num++, address, sector_size);
+        flash_size -= sector_size;
+        address += sector_size;
+    }
+
     ret = flash_device.deinit();
     TEST_ASSERT_EQUAL_INT32(0, ret);
 }

TESTS/mbed_drivers/flashiap/main.cpp

@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2016-2019 ARM Limited. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the License); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 #include "mbed_toolchain.h"
 
 #include <stdio.h>

TESTS/mbedmicro-mbed/attributes/attributes.c

@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2016-2019 ARM Limited. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the License); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 #include "mbed_toolchain.h"
 
 int testWeak1()

TESTS/mbedmicro-mbed/attributes/weak.c

@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2015-2019 ARM Limited. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the License); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 #include "mbed_assert.h"
 #define THE_ANSWER 42
 

TESTS/mbedmicro-mbed/static_assert/test_c.c

@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2016-2019 ARM Limited. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the License); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 #include "mbed_assert.h"
 #define THE_ANSWER 42
 

TESTS/mbedmicro-mbed/static_assert/test_cpp.cpp

@@ -42,6 +42,7 @@ void ASYNCHRONOUS_DNS_CANCEL()
             count++;
         } else {
             // No memory to initiate DNS query, callback will not be called
+            printf("Error: No memory to initiate DNS query for %s\n", dns_test_hosts[i]);
             data[i].result = NSAPI_ERROR_NO_MEMORY;
             data[i].value_set = true;
         }