v4.02 mbed-os 5.12 and PSA boards

Author: Yossi Levy

.mbedignore

@@ -27,3 +27,13 @@ mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX
 mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/ublox-odin-w2-drivers/OdinWiFiInterface.cpp
 mbed-os/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/*
 mbed-os/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/fds/*
+mbed-os/targets/TARGET_Cypress/TARGET_PSOC6/port_api.c
+mbed-os/targets/TARGET_Cypress/TARGET_PSOC6/i2c_api.c 
+mbed-os/targets/TARGET_Cypress/TARGET_PSOC6/pwmout_api.c                  
+mbed-os/platform/mbed_alloc_wrappers.c                                                                         
+mbed-os/platform/mbed_retarget.c  
+mbed-os/usb/device/USBAudio/*
+mbed-os/usb/*
+mbed-os/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT_PSA/spm_init_api.c
+mbed-os/drivers/I2CSlave.cpp
+mbed-os/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.c                                                                        

README.md

@@ -90,12 +90,43 @@ In order for the cloud client to recognise this struct and obtain the informatio
 User **may** set in `mbed_app.json`:
 1. `mbed-bootloader.max-copy-retries`, The number of retries after a failed copy attempt.
 1. `mbed-bootloader.max-boot-retries`, The number of retries after a failed forward to application.
+1. `mbed-bootloader.show-serial-output`, Set to 0 to disable all serial output. Useful for reducing size on headless devices.
 1. `mbed-bootloader.show-progress-bar`, Set to 1 to print a progress bar for various processes.
 1. `mbed-bootloader.max-application-size`, Maximum size of the active application. The default value is `FLASH_START_ADDRESS + FLASH_SIZE - APPLICATION_START_ADDRESS`. Bootloader uses this value to reject candidate image that are too large.
 
 ## Flash Layout
 
-### The flash layout for K64F with KVStore and firmware storage on internal flash
+### Default configuration using flash layout with KVStore and firmware storage on external storage
+
+```
+    +--------------------------+
+    |                          |
+    |                          |
+    |                          |
+    |        Active App        |
+    |                          |
+    |                          |
+    |                          |
+    +--------------------------+ <-+ mbed-bootloader.application-start-address
+    |Active App Metadata Header|
+    +--------------------------+ <-+ update-client.application-details
+    |                          |
+    |         KVSTORE          |
+    |                          |
+    +--------------------------+ <-+ storage_tdb_internal.internal_base_address
+    |                          |
+    |        Bootloader        |
+    |                          |
+    +--------------------------+ <-+ 0
+```
+
+### Notes on Flash Layout of non PSA tagets with external storage 
+
+- This is the default implementation at the default mbed_app.json
+- The default flash layout is tested with GCC_ARM compiler and tiny.json compiler profile only. If a different compiler is used, the bootloader binary size will be larger and the offsets needs to be adjusted.
+- The KVSTORE regions require even number of flash erase sectors.
+
+### The flash layout for non PSA targets with KVStore and firmware storage on internal flash
 
 ```
     +--------------------------+
@@ -127,13 +158,48 @@ User **may** set in `mbed_app.json`:
     +--------------------------+ <-+ 0
 ```
 
-### Notes on Flash Layout
+### Notes on Flash Layout of non PSA targets 
 
 - Internal Flash Only layout can be enabled by compiling the bootloader with the configuration file `--app-config configs/internal_flash_no_rot.json`. By default the firmware storage region and filesystem is on [external sd card](#external-storage).
 - The default flash layout is tested with GCC_ARM compiler and tiny.json compiler profile only. If a different compiler is used, the bootloader binary size will be larger and the offsets needs to be adjusted.
 - The KVSTORE regions require even number of flash erase sectors. If the firmware candidate is stored on internal flash, the bootloader does not access the KVStore. But it still needs to be there for the benefit of the Pelion Device Management Client.
 - Some micro-controller chips are designed with 2 banks of flash that can be read from and written to independently from each other. Hence it is a good idea to put your bootloader and active application on bank 1, your kvstore and firmware candidate storage on bank 2. This way when the application writes data to flash, it doesn't need to halt the processor execution to do it.
 
+
+### PSA configuration using flash layout with KVStore and firmware storage on external storage
+
+```
+    +--------------------------+
+    |                          |
+    |         KVSTORE          |
+    |                          |
+    +--------------------------+ <-+ storage_tdb_internal.internal_base_address
+    |                          |
+    |        Free space        |
+    |                          |
+    +--------------------------+
+    |                          |
+    |                          |
+    |                          |
+    |        Active App        |
+    |                          |
+    |                          |
+    |                          |
+    +--------------------------+ <-+ mbed-bootloader.application-start-address
+    |Active App Metadata Header|
+    +--------------------------+ <-+ update-client.application-details
+    |                          |
+    |        Bootloader        |
+    |                          |
+    +--------------------------+ <-+ 0
+```
+
+### Notes on Flash Layout of PSA targets
+
+- This is the PSA default implementation using the default mbed_app.json
+- The default flash layout is tested with GCC_ARM compiler and tiny.json compiler profile only. If a different compiler is used, the bootloader binary size will be larger and the offsets needs to be adjusted.
+- The KVSTORE regions require even number of flash erase sectors. For PSA targets the KVStore is located at the ends of the flash.
+
 ### Alignment
 
 **Flash Erase Boundary**: Flash can usually only be erased in blocks of specific sizes, this is platform specific and hence many regions need to align to this boundary.

configs/block_device_fake_rot.json

@@ -53,7 +53,8 @@
             "mbed-bootloader.use-kvstore-rot"      : 0,
             "update-client.storage-address"        : "(1024*1024*64)",
             "update-client.storage-size"           : "((MBED_ROM_START + MBED_ROM_SIZE - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
-            "update-client.storage-locations"      : 1
+            "update-client.storage-locations"      : 1,
+            "target.extra_labels_remove"           : [ "WICED", "CORDIO", "PSA", "MBED_SPM" ]
         },
         "NRF52_DK": {
             "sd.SPI_CS"                                : "SPI_PSELSS0",

configs/internal_flash_no_rot.json

@@ -51,23 +51,24 @@
     },
     "macros": [
         "MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
-        "MBED_BOOTLOADER_SIZE=APPLICATION_SIZE",
         "MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE=1024",
-        "FLASH_BANK_SIZE=MBED_ROM_SIZE/2"
+        "MBED_BOOTLOADER_FLASH_BANK_SIZE=MBED_ROM_SIZE/2"
     ],
     "target_overrides": {
         "*": {
             "platform.stdio-baud-rate": 115200,
             "platform.stdio-flush-at-exit": false,
             "update-client.firmware-header-version": "2",
             "mbed-bootloader.use-kvstore-rot": 0,
+            "mbed-bootloader.bootloader-size": "APPLICATION_SIZE",
             "target.restrict_size": "0x8000",
             "update-client.application-details"        : "(MBED_ROM_START + MBED_BOOTLOADER_SIZE)",
             "mbed-bootloader.application-start-address": "(MBED_CONF_UPDATE_CLIENT_APPLICATION_DETAILS + MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE)",
-            "mbed-bootloader.max-application-size"     : "(MBED_ROM_START + FLASH_BANK_SIZE - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS)",
-            "update-client.storage-address"            : "(MBED_ROM_START + FLASH_BANK_SIZE + KVSTORE_SIZE)",
-            "update-client.storage-size"               : "(FLASH_BANK_SIZE - KVSTORE_SIZE)",
-            "update-client.storage-locations"          : 1
+            "mbed-bootloader.max-application-size"     : "(MBED_ROM_START + MBED_BOOTLOADER_FLASH_BANK_SIZE - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS)",
+            "update-client.storage-address"            : "(MBED_ROM_START + MBED_BOOTLOADER_FLASH_BANK_SIZE + KVSTORE_SIZE)",
+            "update-client.storage-size"               : "(MBED_BOOTLOADER_FLASH_BANK_SIZE - KVSTORE_SIZE)",
+            "update-client.storage-locations"          : 1,
+            "target.extra_labels_remove"               : [ "WICED", "CORDIO", "PSA", "MBED_SPM" ]
         },
         "K64F": {
             "kvstore-size": "2*24*1024",
@@ -84,6 +85,10 @@
         "NUCLEO_F303RE": {
             "kvstore-size": "2*24*1024",
             "update-client.storage-page": 1
+        },
+        "DISCO_L475VG_IOT01A": {
+            "kvstore-size": "2*8*1024",
+            "update-client.storage-page": 1
         }
     }
 }

mbed-os.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#51d55508e8400b60af467005646c4e2164738d48
+https://github.com/ARMmbed/mbed-os/#0f959dbe4749c20416236e4fe1dac5692cbe18ab