Integrate update agent interface
Access existing update agent implementation via and update agent
interface. Align tests and deployments to use the new initialization
methods.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I31d501fc6601be6d396ef38ef65c500ba8acdec4
diff --git a/deployments/component-test/component-test.cmake b/deployments/component-test/component-test.cmake
index b733d9c..f39473d 100644
--- a/deployments/component-test/component-test.cmake
+++ b/deployments/component-test/component-test.cmake
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2020-2023, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -106,6 +106,7 @@
"components/service/block_storage/factory/client"
"components/service/block_storage/factory/rpmb"
"components/service/fwu/agent"
+ "components/service/fwu/common"
"components/service/fwu/fw_store/banked"
"components/service/fwu/fw_store/banked/metadata_serializer/v1"
"components/service/fwu/fw_store/banked/metadata_serializer/v2"
diff --git a/deployments/fwu-tool/fwu.cmake b/deployments/fwu-tool/fwu.cmake
index d9cac39..fdaa550 100644
--- a/deployments/fwu-tool/fwu.cmake
+++ b/deployments/fwu-tool/fwu.cmake
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2023, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -24,6 +24,7 @@
"components/media/volume/index"
"components/service/common/include"
"components/service/fwu/agent"
+ "components/service/fwu/common"
"components/service/fwu/config"
"components/service/fwu/config/gpt"
"components/service/fwu/fw_store/banked"
diff --git a/deployments/fwu/env/commonsp/fwu_sp.c b/deployments/fwu/env/commonsp/fwu_sp.c
index c9bf4b1..21d78b7 100644
--- a/deployments/fwu/env/commonsp/fwu_sp.c
+++ b/deployments/fwu/env/commonsp/fwu_sp.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
- * Copyright (c) 2023, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
*/
#include <stddef.h>
@@ -45,7 +45,7 @@
struct ts_rpc_endpoint_sp rpc_endpoint = { 0 };
struct fwu_provider service_provider = { 0 };
struct rpc_service_interface *service_iface = NULL;
- struct update_agent update_agent = { 0 };
+ struct update_agent *update_agent = NULL;
struct fw_store fw_store = { 0 };
struct sp_msg req_msg = { 0 };
struct sp_msg resp_msg = { 0 };
@@ -89,14 +89,15 @@
goto fatal_error;
}
- if (update_agent_init(&update_agent, HARD_CODED_BOOT_INDEX, direct_fw_inspector_inspect,
- &fw_store)) {
+ update_agent = update_agent_init(HARD_CODED_BOOT_INDEX, direct_fw_inspector_inspect,
+ &fw_store);
+ if (!update_agent) {
EMSG("Failed to init update agent");
goto fatal_error;
}
/* Initialise the FWU service provider */
- service_iface = fwu_provider_init(&service_provider, &update_agent);
+ service_iface = fwu_provider_init(&service_provider, update_agent);
if (!service_iface) {
EMSG("Failed to init service provider");
diff --git a/deployments/fwu/fwu.cmake b/deployments/fwu/fwu.cmake
index 7276360..2a7505e 100644
--- a/deployments/fwu/fwu.cmake
+++ b/deployments/fwu/fwu.cmake
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2023, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -19,6 +19,7 @@
"components/media/volume/index"
"components/service/common/include"
"components/service/fwu/agent"
+ "components/service/fwu/common"
"components/service/fwu/config"
"components/service/fwu/config/gpt"
"components/service/fwu/fw_store/banked"
diff --git a/deployments/ts-service-test/linux-pc/CMakeLists.txt b/deployments/ts-service-test/linux-pc/CMakeLists.txt
index b0cd912..4ce36e2 100644
--- a/deployments/ts-service-test/linux-pc/CMakeLists.txt
+++ b/deployments/ts-service-test/linux-pc/CMakeLists.txt
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2020-2023, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -97,6 +97,7 @@
"components/service/block_storage/test/service"
"components/service/common/provider"
"components/service/fwu/agent"
+ "components/service/fwu/common"
"components/service/fwu/fw_store/banked"
"components/service/fwu/fw_store/banked/metadata_serializer/v1"
"components/service/fwu/fw_store/banked/metadata_serializer/v2"