From 701fbe6860a7d656db8385012043ee0391146810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?=
 <lukasz.leczkowski@phoenix-rtos.com>
Date: Tue, 4 Jun 2024 14:53:38 +0200
Subject: [PATCH] include/arch: provide kernel platform includes through arch.h

JIRA: RTOS-846
---
 arch/arm/v7a/reboot.c            |  8 +-------
 arch/arm/v7m/reboot.c            | 11 +----------
 arch/sparcv8leon3/reboot.c       |  9 +--------
 include/arch/armv7a/arch.h       |  8 ++++++++
 include/arch/armv7m/arch.h       | 10 ++++++++++
 include/arch/ia32/arch.h         |  2 ++
 include/arch/riscv64/arch.h      |  2 ++
 include/arch/sparcv8leon3/arch.h |  2 ++
 8 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/arch/arm/v7a/reboot.c b/arch/arm/v7a/reboot.c
index 50be41a3..13f75253 100644
--- a/arch/arm/v7a/reboot.c
+++ b/arch/arm/v7a/reboot.c
@@ -15,13 +15,7 @@
 
 #include <sys/reboot.h>
 #include <sys/platform.h>
-#if defined(__CPU_ZYNQ7000)
-#include <phoenix/arch/armv7a/zynq7000/zynq7000.h>
-#elif defined(__CPU_IMX6ULL)
-#include <phoenix/arch/armv7a/imx6ull/imx6ull.h>
-#else
-#error "Unsupported TARGET"
-#endif
+#include <arch.h>
 
 
 int reboot(int magic)
diff --git a/arch/arm/v7m/reboot.c b/arch/arm/v7m/reboot.c
index 38c32f7c..78c46bd3 100644
--- a/arch/arm/v7m/reboot.c
+++ b/arch/arm/v7m/reboot.c
@@ -15,16 +15,7 @@
 
 #include <sys/reboot.h>
 #include <sys/platform.h>
-
-#if defined(__CPU_STM32L4X6)
-#include <phoenix/arch/armv7m/stm32/l4/stm32l4.h>
-#elif defined(__CPU_IMXRT117X)
-#include <phoenix/arch/armv7m/imxrt/11xx/imxrt1170.h>
-#elif defined(__CPU_IMXRT105X) || defined(__CPU_IMXRT106X)
-#include <phoenix/arch/armv7m/imxrt/10xx/imxrt10xx.h>
-#else
-#error "Unsupported TARGET"
-#endif
+#include <arch.h>
 
 
 int reboot(int magic)
diff --git a/arch/sparcv8leon3/reboot.c b/arch/sparcv8leon3/reboot.c
index 5caab853..762d8dc1 100644
--- a/arch/sparcv8leon3/reboot.c
+++ b/arch/sparcv8leon3/reboot.c
@@ -16,14 +16,7 @@
 
 #include <sys/reboot.h>
 #include <sys/platform.h>
-
-#if defined(__CPU_GR716)
-#include <phoenix/arch/sparcv8leon3/gr716/gr716.h>
-#elif defined(__CPU_GR712RC)
-#include <phoenix/arch/sparcv8leon3/gr712rc/gr712rc.h>
-#else
-#error "Unsupported TARGET"
-#endif
+#include <arch.h>
 
 
 int reboot(int magic)
diff --git a/include/arch/armv7a/arch.h b/include/arch/armv7a/arch.h
index 8a0f5ba2..93f75ad8 100644
--- a/include/arch/armv7a/arch.h
+++ b/include/arch/armv7a/arch.h
@@ -16,6 +16,14 @@
 #ifndef _LIBPHOENIX_ARCH_ARMV7A_ARCH_H_
 #define _LIBPHOENIX_ARCH_ARMV7A_ARCH_H_
 
+#if defined(__CPU_ZYNQ7000)
+#include <phoenix/arch/armv7a/zynq7000/zynq7000.h>
+#elif defined(__CPU_IMX6ULL)
+#include <phoenix/arch/armv7a/imx6ull/imx6ull.h>
+#else
+#error "Unsupported TARGET"
+#endif
+
 #define __ARCH_STDINT    <arch/armv7a/stdint.h>
 #define __ARCH_LIMITS    <arch/armv7a/limits.h>
 
diff --git a/include/arch/armv7m/arch.h b/include/arch/armv7m/arch.h
index 4c69490f..f95e5901 100644
--- a/include/arch/armv7m/arch.h
+++ b/include/arch/armv7m/arch.h
@@ -16,6 +16,16 @@
 #ifndef _LIBPHOENIX_ARCH_ARMV7M_ARCH_H_
 #define _LIBPHOENIX_ARCH_ARMV7M_ARCH_H_
 
+#if defined(__CPU_STM32L4X6)
+#include <phoenix/arch/armv7m/stm32/l4/stm32l4.h>
+#elif defined(__CPU_IMXRT117X)
+#include <phoenix/arch/armv7m/imxrt/11xx/imxrt1170.h>
+#elif defined(__CPU_IMXRT105X) || defined(__CPU_IMXRT106X)
+#include <phoenix/arch/armv7m/imxrt/10xx/imxrt10xx.h>
+#else
+#error "Unsupported TARGET"
+#endif
+
 #define __ARCH_STDINT    <arch/armv7m/stdint.h>
 #define __ARCH_LIMITS    <arch/armv7m/limits.h>
 
diff --git a/include/arch/ia32/arch.h b/include/arch/ia32/arch.h
index 16985323..d4695bf3 100644
--- a/include/arch/ia32/arch.h
+++ b/include/arch/ia32/arch.h
@@ -16,6 +16,8 @@
 #ifndef _LIBPHOENIX_ARCH_IA32_ARCH_H_
 #define _LIBPHOENIX_ARCH_IA32_ARCH_H_
 
+#include <phoenix/arch/ia32/ia32.h>
+
 #define __ARCH_STDINT <arch/ia32/stdint.h>
 #define __ARCH_LIMITS <arch/ia32/limits.h>
 #define __ARCH_SYS_IO <arch/ia32/io.h>
diff --git a/include/arch/riscv64/arch.h b/include/arch/riscv64/arch.h
index 98e70814..227edade 100644
--- a/include/arch/riscv64/arch.h
+++ b/include/arch/riscv64/arch.h
@@ -16,6 +16,8 @@
 #ifndef _LIBPHOENIX_ARCH_RISCV64_ARCH_H_
 #define _LIBPHOENIX_ARCH_RISCV64_ARCH_H_
 
+#include <phoenix/arch/riscv64/riscv64.h>
+
 #define __ARCH_STDINT <arch/riscv64/stdint.h>
 #define __ARCH_LIMITS <arch/riscv64/limits.h>
 #define __ARCH_SYS_IO <arch/riscv64/io.h>
diff --git a/include/arch/sparcv8leon3/arch.h b/include/arch/sparcv8leon3/arch.h
index c0992e26..08713c93 100644
--- a/include/arch/sparcv8leon3/arch.h
+++ b/include/arch/sparcv8leon3/arch.h
@@ -16,6 +16,8 @@
 #ifndef _LIBPHOENIX_ARCH_SPARCV8LEON3_ARCH_H_
 #define _LIBPHOENIX_ARCH_SPARCV8LEON3_ARCH_H_
 
+#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
+
 #define __ARCH_STDINT    <arch/sparcv8leon3/stdint.h>
 #define __ARCH_LIMITS    <arch/sparcv8leon3/limits.h>