build-project.sh: Fx the mcuboot (re)build issue

avnet-iotconnect · Sep 28, 2021 · aba77cc · aba77cc
1 parent bf85723
commit aba77cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/common/project-files/mcuboot_overlay-rsa.conf b/common/project-files/mcuboot_overlay-rsa.conf
@@ -1,2 +1,4 @@
 CONFIG_BOOT_SIGNATURE_TYPE_RSA=y
 CONFIG_BOOT_SIGNATURE_KEY_FILE="root-rsa-2048.pem"
+
+CONFIG_PARTITION_MANAGER_ENABLED=y
diff --git a/scripts/build-project.sh b/scripts/build-project.sh
@@ -42,11 +42,12 @@ esac
 
 build_dir=build_$target
 
+# No longer needed with CONFIG_PARTITION_MANAGER_ENABLED=y in mcuboot_overlay-rsa.conf
 # Workaround for MCUboot config being invalid when building the first time.
 # Otherwise one has to build twice to get a valid build.
-west build -t rebuild_cache -b ${target_board} -d ${build_dir} -- \
-  -DCONFIG_PARTITION_MANAGER_ENABLED=y \
-    "${board_root_flag}"
+# west build -t rebuild_cache -b ${target_board} -d ${build_dir} -- \
+#  -DCONFIG_PARTITION_MANAGER_ENABLED=y \
+#    "${board_root_flag}"
 
 west build -p auto -b $target_board -d $build_dir -- \
   -DCONFIG_IOTCONNECT_CPID=\"${NRF_SAMPLE_CPID}\" \