From 33928f18ae063fa8cb97ebd35481d7a7db04e927 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Sun, 22 Mar 2020 23:38:44 +0900 Subject: [PATCH] arch: arm: aarch32: Add header shims for `cortex_a_r` renaming Out-of-tree code can still be using the old file locations. Introduce header shims to include the headers from the new correct location and print a warning message. These shims should be removed after two releases. Signed-off-by: Stephanos Ioannidis --- arch/arm/include/aarch32/cortex_r/exc.h | 16 ++++++++++++++++ arch/arm/include/aarch32/cortex_r/stack.h | 16 ++++++++++++++++ include/arch/arm/aarch32/cortex_r/cmsis.h | 16 ++++++++++++++++ include/arch/arm/aarch32/cortex_r/cpu.h | 16 ++++++++++++++++ .../cortex_r/scripts/app_data_alignment.ld | 9 +++++++++ .../arch/arm/aarch32/cortex_r/scripts/linker.ld | 7 +++++++ include/arch/arm/aarch32/cortex_r/sys_io.h | 16 ++++++++++++++++ 7 files changed, 96 insertions(+) create mode 100644 arch/arm/include/aarch32/cortex_r/exc.h create mode 100644 arch/arm/include/aarch32/cortex_r/stack.h create mode 100644 include/arch/arm/aarch32/cortex_r/cmsis.h create mode 100644 include/arch/arm/aarch32/cortex_r/cpu.h create mode 100644 include/arch/arm/aarch32/cortex_r/scripts/app_data_alignment.ld create mode 100644 include/arch/arm/aarch32/cortex_r/scripts/linker.ld create mode 100644 include/arch/arm/aarch32/cortex_r/sys_io.h diff --git a/arch/arm/include/aarch32/cortex_r/exc.h b/arch/arm/include/aarch32/cortex_r/exc.h new file mode 100644 index 00000000000..7c624faf379 --- /dev/null +++ b/arch/arm/include/aarch32/cortex_r/exc.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2020 Stephanos Ioannidis + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_EXC_H_ +#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_EXC_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_EXC_H_ */ diff --git a/arch/arm/include/aarch32/cortex_r/stack.h b/arch/arm/include/aarch32/cortex_r/stack.h new file mode 100644 index 00000000000..cf55110252a --- /dev/null +++ b/arch/arm/include/aarch32/cortex_r/stack.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2020 Stephanos Ioannidis + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_STACK_H_ +#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_STACK_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_STACK_H_ */ diff --git a/include/arch/arm/aarch32/cortex_r/cmsis.h b/include/arch/arm/aarch32/cortex_r/cmsis.h new file mode 100644 index 00000000000..22e74409198 --- /dev/null +++ b/include/arch/arm/aarch32/cortex_r/cmsis.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2020 Stephanos Ioannidis + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_ */ diff --git a/include/arch/arm/aarch32/cortex_r/cpu.h b/include/arch/arm/aarch32/cortex_r/cpu.h new file mode 100644 index 00000000000..7941a954fcd --- /dev/null +++ b/include/arch/arm/aarch32/cortex_r/cpu.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2020 Stephanos Ioannidis + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CPU_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CPU_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CPU_H_ */ diff --git a/include/arch/arm/aarch32/cortex_r/scripts/app_data_alignment.ld b/include/arch/arm/aarch32/cortex_r/scripts/app_data_alignment.ld new file mode 100644 index 00000000000..a9257f14ee8 --- /dev/null +++ b/include/arch/arm/aarch32/cortex_r/scripts/app_data_alignment.ld @@ -0,0 +1,9 @@ +/* + * Copyright (c) 2017 Linaro Limited. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/* Set initial alignment to the 32 byte minimum for all MPUs */ +_app_data_align = 32; +. = ALIGN(32); diff --git a/include/arch/arm/aarch32/cortex_r/scripts/linker.ld b/include/arch/arm/aarch32/cortex_r/scripts/linker.ld new file mode 100644 index 00000000000..4dc4979ff0b --- /dev/null +++ b/include/arch/arm/aarch32/cortex_r/scripts/linker.ld @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2020 Stephanos Ioannidis + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include diff --git a/include/arch/arm/aarch32/cortex_r/sys_io.h b/include/arch/arm/aarch32/cortex_r/sys_io.h new file mode 100644 index 00000000000..a2444d51476 --- /dev/null +++ b/include/arch/arm/aarch32/cortex_r/sys_io.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2020 Stephanos Ioannidis + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_ */