Merge pull request #31 from ARMmbed/master

Update release branch
PelionIoT · Nov 21, 2019 · 51e36ba · 51e36ba
2 parents 5a91735 + 673e1cd
commit 51e36ba
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -12,7 +12,7 @@
 //   from ARM Limited or its affiliates.
 //----------------------------------------------------------------------------
 
-repoName = "mbed-bootloader-internal"
+repoName = "mbed-bootloader"
 
 // This build archives artifacts at build stage and later on copies artifacts
 // on the later state. Permission is needed for copying, even for the job itself.
@@ -108,7 +108,6 @@ def build_test_config = [
   // Bootloaders for just testing the build
   ["NRF52840_DK",   "configs/kvstore_and_fw_candidate_on_sd.json", "GCC_ARM"],
   ["NUCLEO_L073RZ", "configs/kvstore_and_fw_candidate_on_sd.json", "GCC_ARM"],
-  ["NUCLEO_F303RE", "configs/internal_kvstore_with_spif.json",     "GCC_ARM"],
   ["DISCO_L475VG_IOT01A", "configs/external_kvstore_with_qspif.json", "GCC_ARM"],
 
   // Bootloaders for release.
@@ -122,6 +121,7 @@ def build_test_config = [
   ["NUCLEO_F411RE",       "configs/kvstore_and_fw_candidate_on_sd.json", "GCC_ARM"],
   ["DISCO_L475VG_IOT01A", "configs/internal_kvstore_with_qspif.json",    "GCC_ARM"],
   ["LPC55S69_NS",         "configs/psa.json",                            "GCC_ARM"],
+  ["NUCLEO_F303RE",       "configs/internal_kvstore_with_spif.json",     "GCC_ARM"],
 ]
 
 
@@ -218,7 +218,7 @@ def SmokeTestStep(step_name,
 
           deleteDir()
           unstash "deployed_bootloader_repo"
-          copyArtifacts filter: '**/mbed-bootloader-internal.*', projectName: '${JOB_NAME}', selector: specific('${BUILD_NUMBER}')
+          copyArtifacts filter: '**/mbed-bootloader.*', projectName: '${JOB_NAME}', selector: specific('${BUILD_NUMBER}')
           dir('TESTS/smoke') {
             sh "./build.sh ${target}"
             sh "ls"
@@ -261,7 +261,7 @@ def ReleaseStep() {
         dir(repoName) {
           deleteDir()
           unstash "deployed_bootloader_repo"
-          copyArtifacts filter: '**/mbed-bootloader-internal*', projectName: '${JOB_NAME}', selector: specific('${BUILD_NUMBER}')
+          copyArtifacts filter: '**/mbed-bootloader*', projectName: '${JOB_NAME}', selector: specific('${BUILD_NUMBER}')
           sh 'mkdir release'
           sh 'python2 ./scripts/make_release.py -o release --prebuilt'
           archiveArtifacts artifacts: 'release/*'

diff --git a/TESTS/booting.log b/TESTS/booting.log
@@ -0,0 +1 @@
+Mbed Bootloader
diff --git a/TESTS/smoke/configs.md b/TESTS/smoke/configs.md
@@ -4,12 +4,12 @@ Following table is parsed automatically by build scripts, so follow the format E
 
 |TARGET|BOOTLOADER_BIN|HEADER_OFFSET|APP_OFFSET|UPDATE_HEADER_OFFSET|UPDATE_APP_OFFSET|
 |------|--------------|-------------|---------|--------------------|------------------|
-|DISCO_L475VG_IOT01A|../../BUILD/mbed_app/DISCO_L475VG_IOT01A/GCC_ARM/mbed-bootloader-internal.bin|0x8000|0x8400|0x80000|0x80070|
-|K64F|../../BUILD/mbed_app/K64F/GCC_ARM/mbed-bootloader-internal.bin|0x8000|0x8400|0x80000|0x80070|
-|NRF52840_DK|../../BUILD/mbed_app/NRF52840_DK/GCC_ARM/mbed-bootloader-internal.hex|0x8000|0x8400|0x80000|0x80070|
-|NUCLEO_F303RE|../../BUILD/mbed_app/NUCLEO_F303RE/GCC_ARM/mbed-bootloader-internal.bin|0x8000|0x8400|0x40000|0x40070|
-|NUCLEO_F411RE|../../BUILD/mbed_app/NUCLEO_F411RE/GCC_ARM/mbed-bootloader-internal.bin|0x8000|0x8400|0x40000|0x40070|
-|NUCLEO_F429ZI|../../BUILD/mbed_app/NUCLEO_F429ZI/GCC_ARM/mbed-bootloader-internal.bin|0x8000|0x8400|0x100000|0x100070|
+|DISCO_L475VG_IOT01A|../../BUILD/mbed_app/DISCO_L475VG_IOT01A/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x80000|0x80070|
+|K64F|../../BUILD/mbed_app/K64F/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x80000|0x80070|
+|NRF52840_DK|../../BUILD/mbed_app/NRF52840_DK/GCC_ARM/mbed-bootloader.hex|0x8000|0x8400|0x80000|0x80070|
+|NUCLEO_F303RE|../../BUILD/mbed_app/NUCLEO_F303RE/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x40000|0x40070|
+|NUCLEO_F411RE|../../BUILD/mbed_app/NUCLEO_F411RE/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x40000|0x40070|
+|NUCLEO_F429ZI|../../BUILD/mbed_app/NUCLEO_F429ZI/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x100000|0x100070|
 
 
 ## Finding the values
@@ -25,8 +25,8 @@ Most values could be found from the `mbed_app.json` used for building the binary
 Usually you need to calculate these values from `mbed_config.h`, sometimes these are easy to find from compilation output.
 
 ```
-Building project mbed-bootloader-internal (K64F, GCC_ARM)
-Scan: mbed-bootloader-internal
+Building project mbed-bootloader (K64F, GCC_ARM)
+Scan: mbed-bootloader
 Using ROM regions application, post_application in this build.
   Region application: size 0x8000, offset 0x0
   Region post_application: size 0xf8000, offset 0x8000

diff --git a/scripts/make_release.py b/scripts/make_release.py
@@ -44,6 +44,9 @@
     ),
     "internal_kvstore_with_qspif": (
         "configs/internal_kvstore_with_qspif.json", "internal-kvstore", "qspif"
+    ),
+    "internal_kvstore_with_spif": (
+        "configs/internal_kvstore_with_spif.json", "internal-kvstore", "spif"
     )
 }
 # format: ("target", "config_name")
@@ -56,7 +59,8 @@
     ("UBLOX_EVK_ODIN_W2", "internal_kvstore_with_sd"),  # cloud client
     ("NUCLEO_F411RE", "kvstore_and_fw_candidate_on_sd"),  # cloud client
     ("DISCO_L475VG_IOT01A", "internal_kvstore_with_qspif"),  # cloud client
-    ("LPC55S69_NS", "psa")  # cloud client
+    ("LPC55S69_NS", "psa"),  # cloud client
+    ("NUCLEO_F303RE", "internal_kvstore_with_spif")  # cloud client
 ]
 toolchain = "GCC_ARM"
 profile = "tiny.json"  # default value, changed via command line arg --profile