From 90554d03c0228f403df3f52ae9c4114c0bdc02b1 Mon Sep 17 00:00:00 2001 From: Damien George Date: Sun, 21 Nov 2021 14:47:40 +1100 Subject: [PATCH] stm32/boards: Build NUCLEO_WB55 and STM32F769DISC without mboot enabled. This is to make the builds for all nucleo/discovery boards uniform, so they can be treated the same by the auto build scripts. The CI script is updated to explicitly enable mboot and packing, to test these features. Signed-off-by: Damien George --- ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk | 7 ------- ports/stm32/boards/STM32F769DISC/mpconfigboard.mk | 3 --- tools/ci.sh | 8 ++++++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk index 4cb047c95e..dcec788ed4 100644 --- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk @@ -1,7 +1,3 @@ -# By default this board is configured to use mboot with packing (signing and encryption) -# enabled. Mboot must be deployed first. -USE_MBOOT ?= 1 - MCU_SERIES = wb CMSIS_MCU = STM32WB55xx AF_FILE = boards/stm32wb55_af.csv @@ -21,6 +17,3 @@ endif MICROPY_PY_BLUETOOTH = 1 MICROPY_BLUETOOTH_NIMBLE = 1 MICROPY_VFS_LFS2 = 1 - -# Mboot settings -MBOOT_ENABLE_PACKING = 1 diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk index 5d3d11a795..dfee1a7ac7 100644 --- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk +++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk @@ -1,6 +1,3 @@ -# By default this board is configured to use mboot which must be deployed first -USE_MBOOT ?= 1 - # By default the filesystem is in external QSPI flash. But by setting the # following option this board puts some code into external flash set in XIP mode. # USE_MBOOT must be enabled; see f769_qspi.ld for code that goes in QSPI flash diff --git a/tools/ci.sh b/tools/ci.sh index f9b90b9687..bf5b1fd043 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -282,12 +282,16 @@ function ci_stm32_nucleo_build { make ${MAKEOPTS} -C mpy-cross make ${MAKEOPTS} -C ports/stm32 submodules git submodule update --init lib/mynewt-nimble + + # Test building various MCU families, some with additional options. make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1' make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L476RG DEBUG=1 - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55 - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55 + + # Test building a board with mboot packing enabled (encryption, signing, compression). + make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55 USE_MBOOT=1 MBOOT_ENABLE_PACKING=1 + make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55 USE_MBOOT=1 MBOOT_ENABLE_PACKING=1 # Test mboot_pack_dfu.py created a valid file, and that its unpack-dfu command works. BOARD_WB55=ports/stm32/boards/NUCLEO_WB55 BUILD_WB55=ports/stm32/build-NUCLEO_WB55