From ea393fac268ec4e6d6c37b76bde088d427bf0d28 Mon Sep 17 00:00:00 2001
From: Lee Lup Yuen <luppy@appkaki.com>
Date: Tue, 28 Jul 2020 13:01:36 +0800
Subject: [PATCH] Create firmware image

---
 .github/workflows/main2.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main2.yml b/.github/workflows/main2.yml
index cf106add..35c6bcc6 100644
--- a/.github/workflows/main2.yml
+++ b/.github/workflows/main2.yml
@@ -96,27 +96,27 @@ jobs:
       
     #########################################################################################
     # Make and upload pinetime-mcuboot-app
+    # pinetime-mcuboot-app.img must be flashed at address 0x8000 in the internal flash memory with OpenOCD:
+    # program image.bin 0x8000
+      
     # For Debugging Builds: Remove "make" option "-j" for clearer output. Add "--trace" to see details.
     # For Faster Builds: Add "make" option "-j"
       
     - name: Make pinetime-mcuboot-app
       run:  cd build && make pinetime-mcuboot-app
 
+    - name: Create firmware image
+      run:  mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header build/src/pinetime-mcuboot-app.bin build/src/pinetime-mcuboot-app.img
+
+    - name: Verify firmware image
+      run:  mcuboot/scripts/imgtool.py verify build/src/pinetime-mcuboot-app.img
+
     - name: Upload pinetime-mcuboot-app
       uses: actions/upload-artifact@v2
       with:
-        name: pinetime-mcuboot-app.bin
-        # A file, directory or wildcard pattern that describes what to upload
-        path: build/src/pinetime-mcuboot-app.bin
+        name: pinetime-mcuboot-app.img
+        path: build/src/pinetime-mcuboot-app.img
         
-    # TODO
-    # It must me converted into a MCUBoot image using imgtool.py from MCUBoot. Simply checkout the project and run the script /scripts/imgtool.py with the following command line:
-    # imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header <build directory>/src/pinetime-mcuboot-app.bin image.bin
-    # The image must be then flashed at address 0x8000 in the internal flash memory.
-    # Using OpenOCD:
-    # program image.bin 0x8000
-    # Download imgtool.py from https://github.com/JuulLabs-OSS/mcuboot/tree/master/scripts
-
     #########################################################################################
     # Make and upload pinetime-app