Merge branch 'master' into ubx_modems_custom_boards

Author: wajahat-abbas

.github/issue_template.md

@@ -6,39 +6,34 @@
    template may cause the bot to automatically correct this header or may result in a 
    warning message, requesting updates.
 
-   Please ensure that nothing follows the Issue request type section, all 
-   issue details are within the Description section and no changes are made to the 
-   template format (as detailed below).
+   Please ensure all sections of the template below are filled in and no changes 
+   are made to the template format. Only bugs should be raised here as issues. 
+   Questions or enhancements should instead be raised on our forums:
+   https://forums.mbed.com/ .
 
    *************************************************************************************
 
 -->
 
-### Description
+### Description of defect
 
 <!--
-    Required
     Add detailed description of what you are reporting.
     Good example: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html
-    Things to consider sharing:
-    - What target does this relate to?
-    - What toolchain (name + version) are you using?
-    - What tools (name + version - is it mbed-cli, online compiler or IDE) are you using?
-    - What is the SHA of Mbed OS (git log -n1 --oneline)?
-    - Steps to reproduce. (Did you publish code or a test case that exhibits the problem?)
 -->
 
 
-### Issue request type
+#### Target(s) affected by this defect ?
+
+
+#### Toolchain(s) (name and version) displaying this defect ?
+
+
+#### What version of Mbed-os are you using (tag or sha) ?
+
+#### What version(s) of tools are you using. List all that apply (E.g. mbed-cli)
+
+
+#### How is this defect reproduced ? 
 
-<!--
-    Required
-    Please add only one X to one of the following types. Do not fill multiple types (split the issue otherwise.)
-    Please note this is not a GitHub task list, indenting the boxes or changing the format to add a '.' or '*' in front
-    of them would change the meaning incorrectly. The only changes to be made are to add a description text under the
-    description heading and to add a 'x' to the correct box.
--->
-    [ ] Question
-    [ ] Enhancement
-    [ ] Bug
 

.github/pull_request_template.md

@@ -1,13 +1,20 @@
-### Description
+<!--
+For more information on the requirements for pull requests, please see [the contributing guidelines](https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html#pull-request-types).
+-->
+### Description (*required*)
 
 <!--
     Required
     Add here detailed changes summary, testing results, dependencies
     Good example: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html (Pull request template)
 -->
+##### Summary of change (*What the change is for and why*)
 
 
-### Pull request type
+##### Documentation (*Details of any document updates required*)
+
+----------------------------------------------------------------------------------------------------------------
+### Pull request type (*required*)
 
 <!--
     Required
@@ -16,25 +23,44 @@
     of them would change the meaning incorrectly. The only changes to be made are to add a description text under the
     description heading and to add a 'x' to the correct box.
 -->
-    [ ] Fix
-    [ ] Refactor
-    [ ] Target update
-    [ ] Functionality change
-    [ ] Docs update
-    [ ] Test update
-    [ ] Breaking change
+    [] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
+    [] Feature update (New feature / Functionality change / New API)
+    [] Major update (Breaking change E.g. Return code change / API behaviour change)
+
+----------------------------------------------------------------------------------------------------------------
+### Test results (*required*)
 
-### Reviewers
+<!--
+    Required
+    For example, add test results for new target
+-->
+    [] No Tests required for this change (E.g docs only update)
+    [] Covered by existing mbed-os tests (Greentea or Unittest)
+    [] Tests / results supplied as part of this PR
+    
+    
+----------------------------------------------------------------------------------------------------------------
+### Reviewers (*optional*)
 
 <!--
     Optional
     Request additional reviewers with @username
 -->
 
-### Release Notes
+----------------------------------------------------------------------------------------------------------------
+### Release Notes (*required for feature/major PRs*)
 
 <!--
-    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).
+    All 3 sections are compulsory for Major PR types. For Feature PRs only the summary section is required.
+    This section is automatically added to release notes. Please fill in each sub-section with sufficient detail for a user.
+    For more information, please see [the contributing guidelines](https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html#pull-request-types). 
 -->
+
+##### Summary of changes
+
+##### Impact of changes
+
+##### Migration actions required
+
+
+

TESTS/host_tests/reset_reason.py

@@ -16,7 +16,6 @@
 """
 import time
 from mbed_host_tests import BaseHostTest
-from mbed_host_tests.host_tests_runner.host_test_default import DefaultTestSelector
 
 DEFAULT_SYNC_DELAY = 4.0
 
@@ -32,6 +31,7 @@
 MSG_KEY_RESET_REASON = 'reason'
 MSG_KEY_DEVICE_RESET = 'reset'
 MSG_KEY_SYNC = '__sync'
+MSG_KEY_RESET_COMPLETE = 'reset_complete'
 
 RESET_REASONS = {
     'POWER_ON': '0',
@@ -80,6 +80,7 @@ def setup(self):
         self.register_callback(MSG_KEY_RESET_REASON_RAW, self.cb_reset_reason_raw)
         self.register_callback(MSG_KEY_RESET_REASON, self.cb_reset_reason)
         self.register_callback(MSG_KEY_DEVICE_RESET, self.cb_reset_reason)
+        self.register_callback(MSG_KEY_RESET_COMPLETE, self.cb_reset_reason)
 
     def cb_device_ready(self, key, value, timestamp):
         """Request a raw value of the reset_reason register.
@@ -142,7 +143,10 @@ def test_steps(self):
         __ignored_clear_ack = yield
 
         # Reset the device using DAP.
-        self.reset_dut(DefaultTestSelector.RESET_TYPE_SW_RST)
+        self.reset()
+        __ignored_reset_ack = yield  # 'reset_complete'
+        time.sleep(self.sync_delay)
+        self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
         reset_reason = yield
         raise_if_different(RESET_REASONS['PIN_RESET'], reset_reason, 'Wrong reset reason. ')
         self.send_kv(MSG_KEY_RESET_REASON, MSG_VALUE_RESET_REASON_CLEAR)

TESTS/mbed_drivers/flashiap/main.cpp

@@ -143,6 +143,7 @@ void flashiap_cross_sector_program_test()
     TEST_ASSERT_EQUAL_INT32(0, ret);
 
     uint32_t page_size = flash_device.get_page_size();
+    uint8_t erase_value = flash_device.get_erase_value();
 
     // Erase last two sectors
     uint32_t address = flash_device.get_flash_start() + flash_device.get_flash_size();
@@ -170,7 +171,7 @@ void flashiap_cross_sector_program_test()
         data[i] = rand() % 256;
     }
     for (uint32_t i = prog_size; i < aligned_prog_size; i++) {
-        data[i] = 0xFF;
+        data[i] = erase_value;
     }
 
     ret = flash_device.program(data, address, prog_size);

TESTS/mbed_hal/qspi/flash_configs/SiliconLabs/EFM32GG11_STK3701/flash_config.h

@@ -23,4 +23,6 @@
 #define QSPI_SECTOR_COUNT                       1024 // for MX25R3235F
 #endif
 
+#define QSPI_MIN_FREQUENCY  2000000
+
 #endif // MBED_QSPI_FLASH_CONFIG_H

TESTS/mbed_hal/qspi/flash_configs/flash_configs.h

@@ -17,23 +17,8 @@
 #ifndef MBED_FLASH_CONFIGS_H
 #define MBED_FLASH_CONFIGS_H
 
-#if defined(TARGET_DISCO_L475VG_IOT01A)
-#include "MX25RXX35F_config.h" // MX25R6435F
-
-#elif defined(TARGET_DISCO_F413ZH)
-#include "N25Q128A_config.h" // N25Q128A13EF840F
-
-#elif defined(TARGET_DISCO_F746NG)
-#include "N25Q128A_config.h" // N25Q128A13EF840E
-
-#elif defined(TARGET_DISCO_F469NI)
-#include "N25Q128A_config.h" // N25Q128A13EF840E
-
-#elif defined(TARGET_DISCO_F769NI)
-#include "MX25L51245G_config.h" // MX25L51245G
-
-#elif defined(TARGET_DISCO_L4R9I)
-#include "MX25LM51245G_config.h" // MX25LM51245G
+#if defined(TARGET_MX25R6435F)
+#include "MX25RXX35F_config.h"
 
 #elif defined(TARGET_DISCO_L476VG)
 #include "N25Q128A_config.h" // N25Q128A13EF840E
@@ -43,6 +28,15 @@
 #undef QSPI_CMD_WRITE_DPI
 #undef QSPI_CMD_WRITE_QPI
 
+#elif defined(TARGET_N25Q128A)
+#include "N25Q128A_config.h"
+
+#elif defined(TARGET_MX25L51245G)
+#include "MX25L51245G_config.h"
+
+#elif defined(TARGET_MX25LM51245G)
+#include "MX25LM51245G_config.h"
+
 #elif defined(TARGET_RHOMBIO_L476DMW1K)
 #include "MT25Q_config.h" // MT25QL128ABA1EW7
 /* See STM32L476 Errata Sheet, it is not possible to use Dual-/Quad-mode for the command phase */
@@ -51,9 +45,6 @@
 #undef QSPI_CMD_WRITE_DPI
 #undef QSPI_CMD_WRITE_QPI
 
-#elif defined(TARGET_DISCO_L496AG)
-#include "MX25RXX35F_config.h" // MX25R6435F
-
 #elif defined(TARGET_NRF52840)
 #include "NORDIC/NRF52840_DK/flash_config.h"
 
@@ -82,11 +73,12 @@
 #include "S25FL512S_config.h"
 
 #elif   defined(TARGET_CYW9P62S1_43012EVB_01)
-#include "S25FS128S_config.h"
+#include "S25FS512S_config.h"
 
 #elif   defined(TARGET_CY8CPROTO_064_SB)
 #include "S25FL128S_config.h"
 
 #endif
+
 #endif // MBED_FLASH_CONFIGS_H
 

TESTS/mbed_hal/qspi/main.cpp

@@ -42,7 +42,9 @@ using namespace utest::v1;
 
 
 
+#ifndef QSPI_MIN_FREQUENCY
 #define QSPI_MIN_FREQUENCY  1000000
+#endif
 
 // max write size is usually page size
 #define DATA_SIZE_256  (QSPI_PAGE_SIZE)
@@ -70,12 +72,12 @@ uint8_t rx_buf[DATA_SIZE_1024];
 
 
 // some target defines QSPI pins as integers thus conversion needed
-#define QPIN_0 static_cast<PinName>(QSPI_FLASH1_IO0)
-#define QPIN_1 static_cast<PinName>(QSPI_FLASH1_IO1)
-#define QPIN_2 static_cast<PinName>(QSPI_FLASH1_IO2)
-#define QPIN_3 static_cast<PinName>(QSPI_FLASH1_IO3)
-#define QSCK   static_cast<PinName>(QSPI_FLASH1_SCK)
-#define QCSN   static_cast<PinName>(QSPI_FLASH1_CSN)
+#define QPIN_0 static_cast<PinName>(MBED_CONF_DRIVERS_QSPI_IO0)
+#define QPIN_1 static_cast<PinName>(MBED_CONF_DRIVERS_QSPI_IO1)
+#define QPIN_2 static_cast<PinName>(MBED_CONF_DRIVERS_QSPI_IO2)
+#define QPIN_3 static_cast<PinName>(MBED_CONF_DRIVERS_QSPI_IO3)
+#define QSCK   static_cast<PinName>(MBED_CONF_DRIVERS_QSPI_SCK)
+#define QCSN   static_cast<PinName>(MBED_CONF_DRIVERS_QSPI_CSN)
 
 
 static uint32_t gen_flash_address()
@@ -344,18 +346,17 @@ void qspi_frequency_test(void)
     ret = qspi_init(&qspi.handle, QPIN_0, QPIN_1, QPIN_2, QPIN_3, QSCK, QCSN, freq, 0);
     TEST_ASSERT_EQUAL(QSPI_STATUS_OK, ret);
 
-    do {
+    while (ret == QSPI_STATUS_OK && freq >= QSPI_MIN_FREQUENCY) {
         // check if the memory is working properly
         qspi.cmd.configure(MODE_1_1_1, ADDR_SIZE_24, ALT_SIZE_8);
-
+        ret = qspi_frequency(&qspi.handle, freq);
         flash_init(qspi);
         _qspi_write_read_test(qspi, WRITE_1_1_1, ADDR_SIZE_24, ALT_SIZE_8, WRITE_SINGLE, READ_1_1_1, ADDR_SIZE_24, ALT_SIZE_8, READ_SINGLE, TEST_REPEAT_SINGLE, DATA_SIZE_256, TEST_FLASH_ADDRESS);
 
         utest_printf("frequency setting %d [Hz] - OK\r\n", freq);
 
         freq /= 2;
-        ret = qspi_frequency(&qspi.handle, freq);
-    } while (ret == QSPI_STATUS_OK && freq >= QSPI_MIN_FREQUENCY);
+    }
 
     qspi_free(&qspi.handle);
 }