Automate generation of signing_keys.c

.github/workflows/compile.yml

@@ -33,10 +33,9 @@ jobs:
           python3 -m pip install --user -r mcuboot/scripts/requirements.txt
           python3 -m pip install --user mcuboot/scripts
           $HOME/.local/bin/imgtool keygen -k signing-keys.pem -t rsa-2048
-          $HOME/.local/bin/imgtool getpub -k signing-keys.pem > signing_keys.c
 
       - name: Build project for ${{ matrix.mbed_target }}
         run: |
             mkdir build && cd build
-            cmake .. -GNinja -DMBED_TARGET=${{ matrix.mbed_target }}
+            cmake .. -GNinja -DMBED_TARGET=${{ matrix.mbed_target }} -DMCUBOOT_SIGNING_KEY=signing-keys.pem
             ninja

CMakeLists.txt

@@ -12,12 +12,7 @@ project(mbed-mcuboot-bootloader)
 set(MBED_MCUBOOT_BOOTLOADER_SOURCES
 	secondary_bd.cpp
 	enc_key.c
-	shared_data.c
-	signing_keys.c)
-
-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/signing_keys.c)
-    message(FATAL_ERROR "Missing signing_keys.c in source directory!  Please follow the README instructions to generate the signing keys!")
-endif()
+	shared_data.c)
 
 # Compile mcuboot sources
 add_subdirectory(mcuboot/boot/bootutil)

secondary_bd.cpp

@@ -9,6 +9,7 @@
 
 #include "SlicingBlockDevice.h"
 #include "FlashIAPBlockDevice.h"
+#include "BufferedBlockDevice.h"
 
 #if MBED_CONF_APP_SECONDARY_SLOT_IN_FLASH
 
@@ -35,9 +36,14 @@ mbed::BlockDevice* get_secondary_bd(void) {
     // If this assert fails, there is no block def
     MBED_ASSERT(default_bd != nullptr);
 
+    // mcuboot assumes that the read size of the secondary block device is the same as the read size
+    // of flash, so use a BufferedBlockDevice to wrap the underlying BD and ensure this is the case.
+    static mbed::BufferedBlockDevice buffered_bd(default_bd);
+
     // In this case, our flash is much larger than a single image so
     // slice it into the size of an image slot
-    static mbed::SlicingBlockDevice sliced_bd(default_bd, 0x0, MCUBOOT_SLOT_SIZE);
+    static mbed::SlicingBlockDevice sliced_bd(&buffered_bd, 0x0, MCUBOOT_SLOT_SIZE);
+
     return &sliced_bd;
 }
 #endif