Remove TS specific prefixes and paths from FWU code
The PSA FWU definitions are not Trusted Services specific, remove
prefixes and directories which indicate otherwise.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I91e3b72fe34070983244f2a926a8e9f4e2617eb7
diff --git a/components/app/fwu-tool/app/metadata_v1_reader.cpp b/components/app/fwu-tool/app/metadata_v1_reader.cpp
index 195fa6e..4394050 100644
--- a/components/app/fwu-tool/app/metadata_v1_reader.cpp
+++ b/components/app/fwu-tool/app/metadata_v1_reader.cpp
@@ -7,7 +7,7 @@
#include <assert.h>
#include "metadata_reader.h"
-#include "protocols/service/fwu/packed-c/metadata_v1.h"
+#include "protocols/service/fwu/metadata_v1.h"
class metadata_v1_reader : public metadata_version_specific_reader {
public:
diff --git a/components/app/fwu-tool/app/metadata_v2_reader.cpp b/components/app/fwu-tool/app/metadata_v2_reader.cpp
index 61faa61..9ce3393 100644
--- a/components/app/fwu-tool/app/metadata_v2_reader.cpp
+++ b/components/app/fwu-tool/app/metadata_v2_reader.cpp
@@ -7,7 +7,7 @@
#include <assert.h>
#include "metadata_reader.h"
-#include "protocols/service/fwu/packed-c/metadata_v2.h"
+#include "protocols/service/fwu/metadata_v2.h"
class metadata_v2_reader : public metadata_version_specific_reader {
public:
diff --git a/components/app/fwu-tool/cmd_print_image_dir.cpp b/components/app/fwu-tool/cmd_print_image_dir.cpp
index 1e07027..a50af82 100644
--- a/components/app/fwu-tool/cmd_print_image_dir.cpp
+++ b/components/app/fwu-tool/cmd_print_image_dir.cpp
@@ -13,7 +13,7 @@
#include "common/uuid/uuid.h"
#include "print_uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "protocols/service/fwu/fwu_proto.h"
void cmd_print_image_dir(fwu_app &app)
{
@@ -29,13 +29,13 @@
return;
}
- if (fetched_object.size() < offsetof(ts_fwu_image_directory, img_info_entry)) {
+ if (fetched_object.size() < offsetof(fwu_image_directory, img_info_entry)) {
printf("Error: invalid image directory size\n");
return;
}
- const struct ts_fwu_image_directory *img_dir =
- (const struct ts_fwu_image_directory *)fetched_object.data();
+ const struct fwu_image_directory *img_dir =
+ (const struct fwu_image_directory *)fetched_object.data();
printf("\nimage_directory (size %zu bytes) :\n", fetched_object.size());
printf("\tdirectory_version : %d\n", img_dir->directory_version);
diff --git a/components/app/fwu-tool/cmd_print_metadata_v1.cpp b/components/app/fwu-tool/cmd_print_metadata_v1.cpp
index 6539e57..0fcfe45 100644
--- a/components/app/fwu-tool/cmd_print_metadata_v1.cpp
+++ b/components/app/fwu-tool/cmd_print_metadata_v1.cpp
@@ -13,8 +13,8 @@
#include "common/uuid/uuid.h"
#include "print_uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
-#include "protocols/service/fwu/packed-c/metadata_v1.h"
+#include "protocols/service/fwu/fwu_proto.h"
+#include "protocols/service/fwu/metadata_v1.h"
void cmd_print_metadata_v1(fwu_app &app)
{
diff --git a/components/app/fwu-tool/cmd_print_metadata_v2.cpp b/components/app/fwu-tool/cmd_print_metadata_v2.cpp
index 666dcb2..7367438 100644
--- a/components/app/fwu-tool/cmd_print_metadata_v2.cpp
+++ b/components/app/fwu-tool/cmd_print_metadata_v2.cpp
@@ -13,8 +13,8 @@
#include "common/uuid/uuid.h"
#include "print_uuid.h"
-#include "protocols/service/fwu/packed-c/fwu_proto.h"
-#include "protocols/service/fwu/packed-c/metadata_v2.h"
+#include "protocols/service/fwu/fwu_proto.h"
+#include "protocols/service/fwu/metadata_v2.h"
void cmd_print_metadata_v2(fwu_app &app)
{