From 5fbe389d9f4f4219d93eb3e32b4127de45f6dc49 Mon Sep 17 00:00:00 2001
From: Daniel Leung <daniel.leung@intel.com>
Date: Thu, 1 Jul 2021 11:42:52 -0700
Subject: [PATCH] soc: intel_adsp: fix inclusion of sys/util.h under XCC
 assembler

This moves the inclusion of sys/util.h inside the #if block to
avoid this being included when going through XCC's assembler.
With the old behavior, a bunch of std*.h get pulled in resulted
in build failure as keywords such as "typedef" are not supposed
to be in assembly files according to XCC assembler.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
---
 soc/xtensa/intel_adsp/cavs_v15/include/soc/shim.h | 2 +-
 soc/xtensa/intel_adsp/cavs_v18/include/soc/shim.h | 2 +-
 soc/xtensa/intel_adsp/cavs_v20/include/soc/shim.h | 2 +-
 soc/xtensa/intel_adsp/cavs_v25/include/soc/shim.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/soc/xtensa/intel_adsp/cavs_v15/include/soc/shim.h b/soc/xtensa/intel_adsp/cavs_v15/include/soc/shim.h
index bf36b8bd564..c811397da2e 100644
--- a/soc/xtensa/intel_adsp/cavs_v15/include/soc/shim.h
+++ b/soc/xtensa/intel_adsp/cavs_v15/include/soc/shim.h
@@ -9,10 +9,10 @@
 #ifndef __PLATFORM_LIB_SHIM_H__
 #define __PLATFORM_LIB_SHIM_H__
 
-#include <sys/util.h>
 #include <soc/memory.h>
 
 #ifndef ASSEMBLY
+#include <sys/util.h>
 #include <stdint.h>
 #endif
 
diff --git a/soc/xtensa/intel_adsp/cavs_v18/include/soc/shim.h b/soc/xtensa/intel_adsp/cavs_v18/include/soc/shim.h
index 6ea6641868d..20cfc4bf7c4 100644
--- a/soc/xtensa/intel_adsp/cavs_v18/include/soc/shim.h
+++ b/soc/xtensa/intel_adsp/cavs_v18/include/soc/shim.h
@@ -10,10 +10,10 @@
 #ifndef __PLATFORM_LIB_SHIM_H__
 #define __PLATFORM_LIB_SHIM_H__
 
-#include <sys/util.h>
 #include <soc/memory.h>
 
 #ifndef ASSEMBLY
+#include <sys/util.h>
 #include <stdint.h>
 #endif
 
diff --git a/soc/xtensa/intel_adsp/cavs_v20/include/soc/shim.h b/soc/xtensa/intel_adsp/cavs_v20/include/soc/shim.h
index 42f603b201e..f17254255b2 100644
--- a/soc/xtensa/intel_adsp/cavs_v20/include/soc/shim.h
+++ b/soc/xtensa/intel_adsp/cavs_v20/include/soc/shim.h
@@ -10,10 +10,10 @@
 #ifndef __PLATFORM_LIB_SHIM_H__
 #define __PLATFORM_LIB_SHIM_H__
 
-#include <sys/util.h>
 #include <soc/memory.h>
 
 #ifndef ASSEMBLY
+#include <sys/util.h>
 #include <stdint.h>
 #endif
 
diff --git a/soc/xtensa/intel_adsp/cavs_v25/include/soc/shim.h b/soc/xtensa/intel_adsp/cavs_v25/include/soc/shim.h
index ba44d95ecc8..42e62dd1a22 100644
--- a/soc/xtensa/intel_adsp/cavs_v25/include/soc/shim.h
+++ b/soc/xtensa/intel_adsp/cavs_v25/include/soc/shim.h
@@ -10,10 +10,10 @@
 #ifndef __PLATFORM_LIB_SHIM_H__
 #define __PLATFORM_LIB_SHIM_H__
 
-#include <sys/util.h>
 #include <soc/memory.h>
 
 #ifndef ASSEMBLY
+#include <sys/util.h>
 #include <stdint.h>
 #endif