Let libraries, targets configure bootloader #5909

theotherjimmy · 2018-01-23T23:48:25Z

Abstract

This PR lets libraries and targets configure boot loader parameters like any other parameter. This allows a release of a boot loader as an mbed library, with an mbed_lib.json that contains links to the boot loader binaries.

Usage

The following patch, to mbed-os-example-bootloader-blinky, shows how this allows a standalone bootloader directory to contain all information required to merge a boot loader.

diff --git a/bootloader/mbed_lib.json b/bootloader/mbed_lib.json
new file mode 100644
index 0000000..eea6b25
--- /dev/null
+++ b/bootloader/mbed_lib.json
@@ -0,0 +1,24 @@
+{
+    "name": "bootloader_images",
+    "target_overrides": {
+        "K64F": {
+            "target.bootloader_img": "K64F.bin"
+        },
+        "NUCLEO_F429ZI": {
+            "target.bootloader_img": "NUCLEO_F429ZI.bin"
+        },
+        "UBLOX_EVK_ODIN_W2": {
+            "target.bootloader_img": "UBLOX_EVK_ODIN_W2.bin"
+        }
+    }
+}
diff --git a/mbed_app.json b/mbed_app.json
deleted file mode 100644
index 12ced95..0000000
--- a/mbed_app.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "target_overrides": {
-        "K64F": {
-            "target.bootloader_img": "bootloader/K64F.bin"
-        },
-        "NUCLEO_F429ZI": {
-            "target.bootloader_img": "bootloader/NUCLEO_F429ZI.bin"
-        },
-        "UBLOX_EVK_ODIN_W2": {
-            "target.bootloader_img": "bootloader/UBLOX_EVK_ODIN_W2.bin"
-        }
-    }
-}

TODO

Config Tests

theotherjimmy · 2018-01-24T23:58:31Z

@sarahmarshy @cmonr @0xc0170 Could you review?

sarahmarshy · 2018-01-26T19:58:25Z

Would it still work at the application level?

theotherjimmy · 2018-01-26T20:00:26Z

Yes.

sarahmarshy · 2018-01-26T20:23:41Z

tools/toolchains/__init__.py

+                self.cc.append("-D%s=0x%x" %  define)
+                self.cppc.append("-D%s=0x%x" %  define)
+                if region.active:
+                    self.ld.append(self.make_ld_define(*define))


Will this still work for MBED_APP_START in the linker scripts? It seems like MBED_APP_START_ADDR would be the new define?

I just tried these changes with bootloader blinky for K64F and it did not work. I could see that it only -DAPPLICATION_ADDR and -DAPPLICATION_SIZE were passed to the linker. The k64f linker script expects MBED_APP_START.

Yep. Let me fix that.

sarahmarshy

The linker script defines need to be added to the profile like on master - https://github.com/ARMmbed/mbed-os/blob/master/tools/build_api.py#L301-L304. The current changes do not pass the correct defines to the linker.

theotherjimmy · 2018-01-26T20:40:57Z

@sarahmarshy The linker defines are passed to the linker, just named incorrectly. The do not need to be part of the profile, just part of the command line.

theotherjimmy · 2018-01-26T20:45:31Z

@sarahmarshy That should do it.

sarahmarshy

Tried with bootloader blinky, and it works now! Good work. LGTM.

theotherjimmy · 2018-01-26T20:48:20Z

now to rebase #5950

cmonr · 2018-01-26T21:05:11Z

/morph build

theotherjimmy · 2018-01-31T16:04:52Z

Rebased
/morph build

mbed-ci · 2018-01-31T16:38:57Z

Build : FAILURE

Build number : 1027
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/5909/

cmonr · 2018-01-31T16:46:46Z

@studavekar Looks like the build experienced a license timeout with the ARM compiler.

studavekar · 2018-01-31T16:51:10Z

@studavekar Looks like the build experienced a license timeout with the ARM compiler.

May be issue with license server/connectivity, re-triggering it

/morph build

mbed-ci · 2018-01-31T17:09:35Z

Build : SUCCESS

Build number : 1028
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/5909/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

mbed-ci · 2018-01-31T18:54:30Z

Exporter Build : SUCCESS

Build number : 710
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/5909/

cmonr · 2018-01-31T19:47:43Z

/morph uvisor-test

mbed-ci · 2018-01-31T23:02:28Z

Test : SUCCESS

Build number : 837
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/5909/837

0xc0170 · 2018-02-01T09:56:15Z

/morph uvisor-test

0xc0170 · 2018-02-01T12:38:53Z

/morph uvisor-test

theotherjimmy · 2018-02-01T15:42:20Z

@cmonr Poke. Looks ready to merge

marcuschangarm · 2018-02-01T15:44:00Z

@cmonr double poke. 😄

marcuschangarm · 2018-02-01T15:50:40Z

@0xc0170 fine, we can poke you too! 😆

cmonr · 2018-02-01T16:29:29Z

Jeez, can't a guy enjoy a morning taco anymore? 😆

cmonr added the needs: review label Jan 23, 2018

theotherjimmy added needs: work and removed needs: review labels Jan 23, 2018

theotherjimmy force-pushed the bl-as-config branch 2 times, most recently from 56e6d39 to 6327d24 Compare January 24, 2018 22:15

theotherjimmy added needs: review and removed needs: work labels Jan 24, 2018

0xc0170 requested review from cmonr and sarahmarshy January 25, 2018 09:05

0xc0170 approved these changes Jan 25, 2018

View reviewed changes

theotherjimmy changed the title ~~Allow libraries to configure bootloader~~ Allow libraries, targets to configure bootloader Jan 25, 2018

theotherjimmy changed the title ~~Allow libraries, targets to configure bootloader~~ Let libraries, targets to configure bootloader Jan 25, 2018

theotherjimmy changed the title ~~Let libraries, targets to configure bootloader~~ Let libraries, targets configure bootloader Jan 25, 2018

theotherjimmy force-pushed the bl-as-config branch 3 times, most recently from 90398ba to db3e87a Compare January 25, 2018 19:48

theotherjimmy mentioned this pull request Jan 26, 2018

Reserve and Render header in managed BL mode #5950

Merged

1 task

sarahmarshy reviewed Jan 26, 2018

View reviewed changes

cmonr approved these changes Jan 26, 2018

View reviewed changes

sarahmarshy suggested changes Jan 26, 2018

View reviewed changes

theotherjimmy force-pushed the bl-as-config branch 2 times, most recently from 741248d to ca56a49 Compare January 26, 2018 20:44

sarahmarshy approved these changes Jan 26, 2018

View reviewed changes

theotherjimmy added 5 commits January 31, 2018 10:04

Configure boot loader after scanning

c180324

Handle target overrides that have a path correctly

dd3708c

Check that boot loader config works in libs

c9add5c

Move region adding to mbedToolchain

a92d0df

Force config resolution in gnuarmeclipse exporter

6eebc71

theotherjimmy force-pushed the bl-as-config branch from 7433ca8 to 6eebc71 Compare January 31, 2018 16:04

cmonr added needs: CI and removed needs: work labels Jan 31, 2018

0xc0170 added ready for merge and removed needs: CI labels Feb 1, 2018

cmonr merged commit bf3693f into ARMmbed:master Feb 1, 2018

cmonr removed the ready for merge label Feb 1, 2018

cmonr added BREAKING-CHANGE release-version: 5.7.5 and removed BREAKING-CHANGE labels Feb 1, 2018

theotherjimmy mentioned this pull request Feb 2, 2018

[feature-nrf528xx] Switch to managed bootloader for SoftDevice merge on NRF52 #6006

Merged

Let libraries, targets configure bootloader #5909

Let libraries, targets configure bootloader #5909

Uh oh!

Conversation

theotherjimmy commented Jan 23, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Abstract

Usage

TODO

Uh oh!

theotherjimmy commented Jan 24, 2018

Uh oh!

sarahmarshy commented Jan 26, 2018

Uh oh!

theotherjimmy commented Jan 26, 2018

Uh oh!

sarahmarshy Jan 26, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sarahmarshy Jan 26, 2018

Choose a reason for hiding this comment

Uh oh!

theotherjimmy Jan 26, 2018

Choose a reason for hiding this comment

Uh oh!

sarahmarshy left a comment

Choose a reason for hiding this comment

Uh oh!

theotherjimmy commented Jan 26, 2018

Uh oh!

theotherjimmy commented Jan 26, 2018

Uh oh!

sarahmarshy left a comment

Choose a reason for hiding this comment

Uh oh!

theotherjimmy commented Jan 26, 2018

Uh oh!

cmonr commented Jan 26, 2018

Uh oh!

theotherjimmy commented Jan 31, 2018

Uh oh!

mbed-ci commented Jan 31, 2018

Build : FAILURE

Uh oh!

cmonr commented Jan 31, 2018

Uh oh!

studavekar commented Jan 31, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mbed-ci commented Jan 31, 2018

Build : SUCCESS

Triggering tests

Uh oh!

mbed-ci commented Jan 31, 2018

Exporter Build : SUCCESS

Uh oh!

cmonr commented Jan 31, 2018

Uh oh!

mbed-ci commented Jan 31, 2018

Test : SUCCESS

Uh oh!

0xc0170 commented Feb 1, 2018

Uh oh!

0xc0170 commented Feb 1, 2018

Uh oh!

theotherjimmy commented Feb 1, 2018

Uh oh!

marcuschangarm commented Feb 1, 2018

Uh oh!

marcuschangarm commented Feb 1, 2018

Uh oh!

cmonr commented Feb 1, 2018

Uh oh!

Uh oh!

theotherjimmy commented Jan 23, 2018 •

edited

Loading

sarahmarshy Jan 26, 2018 •

edited

Loading

studavekar commented Jan 31, 2018 •

edited

Loading