headers: Use full path to header

Path added to include should end at 'include' as usual, then
it is easy to see where specific headers comes from during reading
source code. It is especially important for projects composed from
a few parts, like firmware, driver, build and debug tools in this
project.
Moreover changed "" to <> in include directives because there is
specified full path to file from project include root and to be
aligned with code style from firmware repository,

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>

CMakeLists.txt

@@ -29,8 +29,7 @@ target_compile_options(rimage PRIVATE
 target_link_libraries(rimage PRIVATE "-lcrypto")
 
 target_include_directories(rimage PRIVATE
-	src/include/rimage
-	src/include/rimage/sof
+	src/include/
 )
 
 install(TARGETS rimage DESTINATION bin)

src/cse.c

@@ -6,9 +6,9 @@
 //         Keyon Jie <yang.jie@linux.intel.com>
 
 #include <stdio.h>
-#include "rimage.h"
-#include "cse.h"
-#include "manifest.h"
+#include <rimage/rimage.h>
+#include <rimage/cse.h>
+#include <rimage/manifest.h>
 
 void ri_cse_create(struct image *image)
 {

src/css.c

@@ -7,9 +7,9 @@
 
 #include <stdio.h>
 #include <sys/time.h>
-#include "rimage.h"
-#include "css.h"
-#include "manifest.h"
+#include <rimage/rimage.h>
+#include <rimage/css.h>
+#include <rimage/manifest.h>
 
 void ri_css_v1_8_hdr_create(struct image *image)
 {

src/elf.c

@@ -7,9 +7,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "rimage.h"
-#include "cse.h"
-#include "manifest.h"
+#include <rimage/rimage.h>
+#include <rimage/cse.h>
+#include <rimage/manifest.h>
 
 static int elf_read_sections(struct image *image, struct module *module,
 			     int module_index)

src/ext_manifest.c

@@ -9,9 +9,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "ext_manifest_gen.h"
-#include "kernel/ext_manifest.h"
-#include "rimage.h"
+#include <rimage/ext_manifest_gen.h>
+#include <rimage/sof/kernel/ext_manifest.h>
+#include <rimage/rimage.h>
 
 const struct ext_man_header ext_man_template = {
 	.magic = EXT_MAN_MAGIC_NUMBER,

src/file_simple.c

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "rimage.h"
+#include <rimage/rimage.h>
 
 #define BYT_IRAM_BASE		0xff2c0000
 #define BYT_IRAM_HOST_OFFSET	0x0C0000

src/hash.c

@@ -17,8 +17,8 @@
 #include <openssl/evp.h>
 #include <openssl/err.h>
 
-#include "rimage.h"
-#include "manifest.h"
+#include <rimage/rimage.h>
+#include <rimage/manifest.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 void EVP_MD_CTX_free(EVP_MD_CTX *ctx);

src/include/rimage/ext_manifest_gen.h

@@ -27,7 +27,7 @@
 #ifndef __EXT_MAN_H__
 #define __EXT_MAN_H__
 
-#include "rimage.h"
+#include <rimage/rimage.h>
 
 #define EXT_MAN_DATA_SECTION ".fw_metadata"
 

src/include/rimage/manifest.h

@@ -7,10 +7,10 @@
 #define __MANIFEST_H__
 
 #include <stdint.h>
-#include <user/manifest.h>
-#include "css.h"
-#include "cse.h"
-#include "plat_auth.h"
+#include <rimage/sof/user/manifest.h>
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
 
 #define MAN_PAGE_SIZE		4096
 

src/include/rimage/rimage.h

@@ -14,7 +14,7 @@
 #include <openssl/conf.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
-#include <kernel/fw.h>
+#include <rimage/sof/kernel/fw.h>
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 #define MAX_MODULES		32

src/man_apl.c

@@ -2,10 +2,10 @@
 //
 // Copyright(c) 2017 Intel Corporation. All rights reserved.
 
-#include "css.h"
-#include "cse.h"
-#include "plat_auth.h"
-#include "manifest.h"
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
+#include <rimage/manifest.h>
 
 /* manifest template */
 struct fw_image_manifest_v1_8 apl_manifest = {

src/man_cnl.c

@@ -2,10 +2,10 @@
 //
 // Copyright(c) 2017 Intel Corporation. All rights reserved.
 
-#include "css.h"
-#include "cse.h"
-#include "plat_auth.h"
-#include "manifest.h"
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
+#include <rimage/manifest.h>
 
 /* manifest template */
 struct fw_image_manifest_v1_8 cnl_manifest = {

src/man_kbl.c

@@ -2,10 +2,10 @@
 //
 // Copyright(c) 2018 Intel Corporation. All rights reserved.
 
-#include "css.h"
-#include "cse.h"
-#include "plat_auth.h"
-#include "manifest.h"
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
+#include <rimage/manifest.h>
 
 /*
  * TODO: check if all platform for 1.5 are the same base and length.

src/man_sue.c

@@ -2,10 +2,10 @@
 //
 // Copyright(c) 2017 Intel Corporation. All rights reserved.
 
-#include "css.h"
-#include "cse.h"
-#include "plat_auth.h"
-#include "manifest.h"
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
+#include <rimage/manifest.h>
 
 /* manifest template */
 struct fw_image_manifest_v1_5_sue sue_manifest = {

src/man_tgl.c

@@ -2,10 +2,10 @@
 //
 // Copyright(c) 2019 Intel Corporation. All rights reserved.
 
-#include "css.h"
-#include "cse.h"
-#include "plat_auth.h"
-#include "manifest.h"
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
+#include <rimage/manifest.h>
 
 /* manifest template */
 struct fw_image_manifest_v2_5 tgl_manifest = {

src/manifest.c

@@ -14,13 +14,13 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include <user/manifest.h>
+#include <rimage/sof/user/manifest.h>
 
-#include "rimage.h"
-#include "css.h"
-#include "cse.h"
-#include "plat_auth.h"
-#include "manifest.h"
+#include <rimage/rimage.h>
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
+#include <rimage/manifest.h>
 
 static int man_open_rom_file(struct image *image)
 {

src/pkcs1_5.c

@@ -17,9 +17,9 @@
 #include <errno.h>
 #include <string.h>
 
-#include "rimage.h"
-#include "css.h"
-#include "manifest.h"
+#include <rimage/rimage.h>
+#include <rimage/css.h>
+#include <rimage/manifest.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 void RSA_get0_key(const RSA *r,

src/plat_auth.c

@@ -5,9 +5,9 @@
 // Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
 //         Keyon Jie <yang.jie@linux.intel.com>
 
-#include "rimage.h"
-#include "manifest.h"
-#include "plat_auth.h"
+#include <rimage/rimage.h>
+#include <rimage/manifest.h>
+#include <rimage/plat_auth.h>
 
 void ri_adsp_meta_data_create_v1_8(struct image *image, int meta_start_offset,
 				   int meta_end_offset)

src/rimage.c

@@ -8,9 +8,9 @@
 #include <errno.h>
 #include <string.h>
 
-#include "ext_manifest_gen.h"
-#include "rimage.h"
-#include "manifest.h"
+#include <rimage/ext_manifest_gen.h>
+#include <rimage/rimage.h>
+#include <rimage/manifest.h>
 
 static const struct adsp *machine[] = {
 	&machine_byt,