From e8607758731eda7845047c96a1e655b0ff708a8c Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Thu, 28 Jun 2018 08:59:56 -0500
Subject: [PATCH] Revert "arch: arm: stm32: correct include issue"

This reverts commit 30529da0e4ab6ff967ccdd18dcae4f161de7be24.

We should include SoC headers from HALs before we include
kernel_includes.h.  On ARM this is needed because we tend to get CMSIS
related defines setup by the HAL headers.

Fixes: #8593

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 arch/arm/soc/st_stm32/stm32f4/soc.h | 3 ++-
 arch/arm/soc/st_stm32/stm32l4/soc.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/soc/st_stm32/stm32f4/soc.h b/arch/arm/soc/st_stm32/stm32f4/soc.h
index 8e462bfb7db..044701feee7 100644
--- a/arch/arm/soc/st_stm32/stm32f4/soc.h
+++ b/arch/arm/soc/st_stm32/stm32f4/soc.h
@@ -24,9 +24,10 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <kernel_includes.h>
 #include <stm32f4xx.h>
 
+#include <kernel_includes.h>
+
 #ifdef CONFIG_CLOCK_CONTROL_STM32_CUBE
 #include <stm32f4xx_ll_utils.h>
 #include <stm32f4xx_ll_bus.h>
diff --git a/arch/arm/soc/st_stm32/stm32l4/soc.h b/arch/arm/soc/st_stm32/stm32l4/soc.h
index 025c370ae4a..fafe6725dde 100644
--- a/arch/arm/soc/st_stm32/stm32l4/soc.h
+++ b/arch/arm/soc/st_stm32/stm32l4/soc.h
@@ -22,8 +22,8 @@
 #ifndef _ASMLANGUAGE
 
 #include <autoconf.h>
-#include <kernel_includes.h>
 #include <stm32l4xx.h>
+#include <kernel_includes.h>
 
 #define GPIO_REG_SIZE         0x400
 /* base address for where GPIO registers start */