From 93f1a2eaa7c889f9b55af3abaa9608c0133a60b1 Mon Sep 17 00:00:00 2001
From: Bartosz Kokoszko <bartoszx.kokoszko@linux.intel.com>
Date: Tue, 27 Nov 2018 10:43:06 +0100
Subject: [PATCH] logger: include file_format.h directly from rimage

Signed-off-by: Bartosz Kokoszko <bartoszx.kokoszko@linux.intel.com>
---
 tools/logger/Makefile.am |  1 +
 tools/logger/convert.c   | 15 ---------------
 tools/logger/convert.h   |  1 +
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/tools/logger/Makefile.am b/tools/logger/Makefile.am
index 22474d3e2..2a154135c 100644
--- a/tools/logger/Makefile.am
+++ b/tools/logger/Makefile.am
@@ -6,5 +6,6 @@ sof_logger_SOURCES = \
 
 sof_logger_CFLAGS = \
 	-I ../../src/include \
+	-I ../../ \
 	-Wall \
 	-Werror
diff --git a/tools/logger/convert.c b/tools/logger/convert.c
index 5e157ffdd..11c7d5858 100644
--- a/tools/logger/convert.c
+++ b/tools/logger/convert.c
@@ -29,21 +29,6 @@
 #define TRACE_MAX_IDS_STR		10
 #define TRACE_IDS_MASK			((1 << TRACE_ID_LENGTH) - 1)
 
-/* logs file signature */
-#define SND_SOF_LOGS_SIG_SIZE	4
-#define SND_SOF_LOGS_SIG	"Logs"
-
-/*
-* Logs dictionary file header.
-*/
-struct snd_sof_logs_header {
-	unsigned char sig[SND_SOF_LOGS_SIG_SIZE]; /* "Logs" */
-	uint32_t base_address;  /* address of log entries section */
-	uint32_t data_length;   /* amount of bytes following this header */
-	uint32_t data_offset;   /* offset to first entry in this file */
-	struct sof_ipc_fw_version version;
-};
-
 struct ldc_entry_header {
 	uint32_t level;
 	uint32_t component_class;
diff --git a/tools/logger/convert.h b/tools/logger/convert.h
index b881db75b..d3dcde9c8 100644
--- a/tools/logger/convert.h
+++ b/tools/logger/convert.h
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <uapi/user/trace.h>
 #include <uapi/ipc/info.h>
+#include <rimage/file_format.h>
 
 #define KNRM  "\x1B[0m"
 #define KRED  "\x1B[31m"