Skip to content

Commit 78c4589

Browse files
committed
include/arch: provide kernel platform includes through arch.h
JIRA: RTOS-846
1 parent 81b5a09 commit 78c4589

File tree

8 files changed

+27
-25
lines changed

8 files changed

+27
-25
lines changed

arch/arm/v7a/reboot.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515

1616
#include <sys/reboot.h>
1717
#include <sys/platform.h>
18-
#if defined(__CPU_ZYNQ7000)
19-
#include <phoenix/arch/armv7a/zynq7000/zynq7000.h>
20-
#elif defined(__CPU_IMX6ULL)
21-
#include <phoenix/arch/armv7a/imx6ull/imx6ull.h>
22-
#else
23-
#error "Unsupported TARGET"
24-
#endif
18+
#include <arch.h>
2519

2620

2721
int reboot(int magic)

arch/arm/v7m/reboot.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@
1515

1616
#include <sys/reboot.h>
1717
#include <sys/platform.h>
18-
19-
#if defined(__CPU_STM32L4X6)
20-
#include <phoenix/arch/armv7m/stm32/l4/stm32l4.h>
21-
#elif defined(__CPU_IMXRT117X)
22-
#include <phoenix/arch/armv7m/imxrt/11xx/imxrt1170.h>
23-
#elif defined(__CPU_IMXRT105X) || defined(__CPU_IMXRT106X)
24-
#include <phoenix/arch/armv7m/imxrt/10xx/imxrt10xx.h>
25-
#else
26-
#error "Unsupported TARGET"
27-
#endif
18+
#include <arch.h>
2819

2920

3021
int reboot(int magic)

arch/sparcv8leon3/reboot.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,7 @@
1616

1717
#include <sys/reboot.h>
1818
#include <sys/platform.h>
19-
20-
#if defined(__CPU_GR716)
21-
#include <phoenix/arch/sparcv8leon3/gr716/gr716.h>
22-
#elif defined(__CPU_GR712RC)
23-
#include <phoenix/arch/sparcv8leon3/gr712rc/gr712rc.h>
24-
#else
25-
#error "Unsupported TARGET"
26-
#endif
19+
#include <arch.h>
2720

2821

2922
int reboot(int magic)

include/arch/armv7a/arch.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
#ifndef _LIBPHOENIX_ARCH_ARMV7A_ARCH_H_
1717
#define _LIBPHOENIX_ARCH_ARMV7A_ARCH_H_
1818

19+
#if defined(__CPU_ZYNQ7000)
20+
#include <phoenix/arch/armv7a/zynq7000/zynq7000.h>
21+
#elif defined(__CPU_IMX6ULL)
22+
#include <phoenix/arch/armv7a/imx6ull/imx6ull.h>
23+
#else
24+
#error "Unsupported TARGET"
25+
#endif
26+
1927
#define __ARCH_STDINT <arch/armv7a/stdint.h>
2028
#define __ARCH_LIMITS <arch/armv7a/limits.h>
2129

include/arch/armv7m/arch.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616
#ifndef _LIBPHOENIX_ARCH_ARMV7M_ARCH_H_
1717
#define _LIBPHOENIX_ARCH_ARMV7M_ARCH_H_
1818

19+
#if defined(__CPU_STM32L4X6)
20+
#include <phoenix/arch/armv7m/stm32/l4/stm32l4.h>
21+
#elif defined(__CPU_IMXRT117X)
22+
#include <phoenix/arch/armv7m/imxrt/11xx/imxrt1170.h>
23+
#elif defined(__CPU_IMXRT105X) || defined(__CPU_IMXRT106X)
24+
#include <phoenix/arch/armv7m/imxrt/10xx/imxrt10xx.h>
25+
#else
26+
#error "Unsupported TARGET"
27+
#endif
28+
1929
#define __ARCH_STDINT <arch/armv7m/stdint.h>
2030
#define __ARCH_LIMITS <arch/armv7m/limits.h>
2131

include/arch/ia32/arch.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#ifndef _LIBPHOENIX_ARCH_IA32_ARCH_H_
1717
#define _LIBPHOENIX_ARCH_IA32_ARCH_H_
1818

19+
#include <phoenix/arch/ia32/ia32.h>
20+
1921
#define __ARCH_STDINT <arch/ia32/stdint.h>
2022
#define __ARCH_LIMITS <arch/ia32/limits.h>
2123
#define __ARCH_SYS_IO <arch/ia32/io.h>

include/arch/riscv64/arch.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#ifndef _LIBPHOENIX_ARCH_RISCV64_ARCH_H_
1717
#define _LIBPHOENIX_ARCH_RISCV64_ARCH_H_
1818

19+
#include <phoenix/arch/riscv64/riscv64.h>
20+
1921
#define __ARCH_STDINT <arch/riscv64/stdint.h>
2022
#define __ARCH_LIMITS <arch/riscv64/limits.h>
2123
#define __ARCH_SYS_IO <arch/riscv64/io.h>

include/arch/sparcv8leon3/arch.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON3_ARCH_H_
1717
#define _LIBPHOENIX_ARCH_SPARCV8LEON3_ARCH_H_
1818

19+
#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
20+
1921
#define __ARCH_STDINT <arch/sparcv8leon3/stdint.h>
2022
#define __ARCH_LIMITS <arch/sparcv8leon3/limits.h>
2123

0 commit comments

Comments
 (0)