From ea1a8c0c2fe7b25bb3afb9298cb5b6a0b40c042b Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Thu, 20 Feb 2025 11:50:51 +0000 Subject: [PATCH] bsp: Align Corstone-1000 image configuration with mender Aligns mender related configuration for Corstone-1000 platform. Additionally, Corstone-1000 capsule key and certificate files are already installed by u-boot recipe and mender build triggers firmware-deploy task again to copy these binaries which causes an issue. So this commits also removes capsule key and certification for Corstone-1000 for mender builds. Signed-off-by: Vikas Katariya Signed-off-by: Emekcan Aras --- .../corstone1000-mps3-cassini-extra-settings.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc index 4f7d52e..6f60063 100644 --- a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc +++ b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2025 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -9,3 +9,11 @@ IMAGE_INSTALL:append:cassini = " wait-online" # Since the host has two stage booting, we need to ensure we # only get a single ip address for the same MAC incase of reboot IMAGE_INSTALL:append:cassini = " send-no-hostname" + +# Mender configuration +INHERIT:remove:firmware = " ${@bb.utils.contains('VIRTUAL-RUNTIME_ota_update',\ + 'mender-ota', 'mender-maybe-setup', '',d)}" +MENDER_EFI_LOADER:firmware = "" +FIRMWARE_BINARIES:remove:pn-firmware-deploy-image = " ${@bb.utils.contains(\ + 'VIRTUAL-RUNTIME_ota_update', 'mender-ota', \ + ' corstone1000_capsule_cert.crt corstone1000_capsule_key.key', '',d)}" -- GitLab