[Sound-open-firmware] [PATCH] rimage: fix manifest header path

Xiuli Pan xiuli.pan at linux.intel.com
Thu Feb 1 08:13:32 CET 2018


From: Pan Xiuli <xiuli.pan at linux.intel.com>

We moved header manifest.h is sof/upai now. Modify the configure path
and include path.

Signed-off-by: Pan Xiuli <xiuli.pan at linux.intel.com>
---
Test with:
GP-MRB with NoCodec, Mininow max rt5651
SOF master:
0505823b9667036202758ea950c3ff3347359730
SOF-Tool master:
8c9ebfe9c4f8037b0d0816dedcb87dabef347c6b
https://github.com/plbossart/sound/tree/topic/sof-v4.14:
5a91e6776d41b0e97828882294cdc00b5c0bafd6

Signed-off-by: Pan Xiuli <xiuli.pan at linux.intel.com>
---
 configure.ac      | 2 +-
 rimage/manifest.c | 2 +-
 rimage/manifest.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6e9c758..f85f18c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([sof-tools], [1.0.1])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([rimage/rimage.c])
 AC_CONFIG_HEADERS([config.h])
-AC_CHECK_HEADER([sof/manifest.h])
+AC_CHECK_HEADER([sof/uapi/manifest.h])
 
 AC_CANONICAL_HOST
 
diff --git a/rimage/manifest.c b/rimage/manifest.c
index 24fb76f..68e6d8b 100644
--- a/rimage/manifest.c
+++ b/rimage/manifest.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
-#include <sof/manifest.h>
+#include <sof/uapi/manifest.h>
 
 #include "rimage.h"
 #include "file_format.h"
diff --git a/rimage/manifest.h b/rimage/manifest.h
index 348f47f..655963f 100644
--- a/rimage/manifest.h
+++ b/rimage/manifest.h
@@ -15,7 +15,7 @@
 #define __MANIFEST_H__
 
 #include <stdint.h>
-#include <sof/manifest.h>
+#include <sof/uapi/manifest.h>
 #include "css.h"
 #include "cse.h"
 #include "plat_auth.h"
-- 
2.7.4



More information about the Sound-open-firmware mailing list