diff --git a/Kconfig.zephyr b/Kconfig.zephyr index ad98e381e68..2a7e52dc035 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -413,3 +413,14 @@ config MISRA_SANE arrays are not permitted (and gcc will enforce this). endmenu + +menu "Compatibility" + +config COMPAT_INCLUDES + bool "Suppress warnings when using header shims" + default y + help + Suppress any warnings from the pre-processor when including + deprecated header files. + +endmenu diff --git a/arch/arm/include/cortex_m/cmse.h b/arch/arm/include/cortex_m/cmse.h new file mode 100644 index 00000000000..5810a2b5d17 --- /dev/null +++ b/arch/arm/include/cortex_m/cmse.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ +#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ */ diff --git a/arch/arm/include/cortex_m/exc.h b/arch/arm/include/cortex_m/exc.h new file mode 100644 index 00000000000..9adbcee6ce9 --- /dev/null +++ b/arch/arm/include/cortex_m/exc.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ +#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ */ diff --git a/arch/arm/include/cortex_m/stack.h b/arch/arm/include/cortex_m/stack.h new file mode 100644 index 00000000000..71b0ec723d6 --- /dev/null +++ b/arch/arm/include/cortex_m/stack.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ +#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ */ diff --git a/arch/arm/include/cortex_m/tz.h b/arch/arm/include/cortex_m/tz.h new file mode 100644 index 00000000000..aaa96561beb --- /dev/null +++ b/arch/arm/include/cortex_m/tz.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ +#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ */ diff --git a/arch/arm/include/cortex_r/exc.h b/arch/arm/include/cortex_r/exc.h new file mode 100644 index 00000000000..201e225f0fc --- /dev/null +++ b/arch/arm/include/cortex_r/exc.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_EXC_H_ +#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_EXC_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_EXC_H_ */ diff --git a/arch/arm/include/cortex_r/stack.h b/arch/arm/include/cortex_r/stack.h new file mode 100644 index 00000000000..4b1256eea4c --- /dev/null +++ b/arch/arm/include/cortex_r/stack.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_STACK_H_ +#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_STACK_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_STACK_H_ */ diff --git a/include/arch/arm/arch.h b/include/arch/arm/arch.h new file mode 100644 index 00000000000..a64456c9b42 --- /dev/null +++ b/include/arch/arm/arch.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ */ diff --git a/include/arch/arm/asm_inline.h b/include/arch/arm/asm_inline.h new file mode 100644 index 00000000000..74934a9d21b --- /dev/null +++ b/include/arch/arm/asm_inline.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ */ diff --git a/include/arch/arm/asm_inline_gcc.h b/include/arch/arm/asm_inline_gcc.h new file mode 100644 index 00000000000..58de07711c5 --- /dev/null +++ b/include/arch/arm/asm_inline_gcc.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ */ diff --git a/include/arch/arm/cortex_m/cmsis.h b/include/arch/arm/cortex_m/cmsis.h new file mode 100644 index 00000000000..72f3fde948d --- /dev/null +++ b/include/arch/arm/cortex_m/cmsis.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ */ diff --git a/include/arch/arm/cortex_m/cpu.h b/include/arch/arm/cortex_m/cpu.h new file mode 100644 index 00000000000..1fc7f6def41 --- /dev/null +++ b/include/arch/arm/cortex_m/cpu.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CPU_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CPU_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CPU_H_ */ diff --git a/include/arch/arm/cortex_m/memory_map.h b/include/arch/arm/cortex_m/memory_map.h new file mode 100644 index 00000000000..fffb84375e4 --- /dev/null +++ b/include/arch/arm/cortex_m/memory_map.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ */ diff --git a/include/arch/arm/cortex_m/mpu/arm_mpu.h b/include/arch/arm/cortex_m/mpu/arm_mpu.h new file mode 100644 index 00000000000..9b8fc7e594b --- /dev/null +++ b/include/arch/arm/cortex_m/mpu/arm_mpu.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ */ diff --git a/include/arch/arm/cortex_m/mpu/arm_mpu_v7m.h b/include/arch/arm/cortex_m/mpu/arm_mpu_v7m.h new file mode 100644 index 00000000000..13a36960b65 --- /dev/null +++ b/include/arch/arm/cortex_m/mpu/arm_mpu_v7m.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_V7M_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_V7M_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_V7M_H_ */ diff --git a/include/arch/arm/cortex_m/mpu/arm_mpu_v8m.h b/include/arch/arm/cortex_m/mpu/arm_mpu_v8m.h new file mode 100644 index 00000000000..4e5db3a0081 --- /dev/null +++ b/include/arch/arm/cortex_m/mpu/arm_mpu_v8m.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_V8M_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_V8M_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_V8M_H_ */ diff --git a/include/arch/arm/cortex_m/mpu/nxp_mpu.h b/include/arch/arm/cortex_m/mpu/nxp_mpu.h new file mode 100644 index 00000000000..fe0b9c566d1 --- /dev/null +++ b/include/arch/arm/cortex_m/mpu/nxp_mpu.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ */ diff --git a/include/arch/arm/cortex_m/scripts/linker.ld b/include/arch/arm/cortex_m/scripts/linker.ld new file mode 100644 index 00000000000..1699eba67a2 --- /dev/null +++ b/include/arch/arm/cortex_m/scripts/linker.ld @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include diff --git a/include/arch/arm/cortex_r/cpu.h b/include/arch/arm/cortex_r/cpu.h new file mode 100644 index 00000000000..f4b12cdca38 --- /dev/null +++ b/include/arch/arm/cortex_r/cpu.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_CPU_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_CPU_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_CPU_H_ */ diff --git a/include/arch/arm/cortex_r/scripts/app_data_alignment.ld b/include/arch/arm/cortex_r/scripts/app_data_alignment.ld new file mode 100644 index 00000000000..a9257f14ee8 --- /dev/null +++ b/include/arch/arm/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/cortex_r/scripts/linker.ld b/include/arch/arm/cortex_r/scripts/linker.ld new file mode 100644 index 00000000000..3b4125efa6f --- /dev/null +++ b/include/arch/arm/cortex_r/scripts/linker.ld @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include diff --git a/include/arch/arm/cortex_r/sys_io.h b/include/arch/arm/cortex_r/sys_io.h new file mode 100644 index 00000000000..79212a0b641 --- /dev/null +++ b/include/arch/arm/cortex_r/sys_io.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ */ diff --git a/include/arch/arm/error.h b/include/arch/arm/error.h new file mode 100644 index 00000000000..86784334131 --- /dev/null +++ b/include/arch/arm/error.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ */ diff --git a/include/arch/arm/exc.h b/include/arch/arm/exc.h new file mode 100644 index 00000000000..c5319994fb6 --- /dev/null +++ b/include/arch/arm/exc.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_ */ diff --git a/include/arch/arm/irq.h b/include/arch/arm/irq.h new file mode 100644 index 00000000000..fe749dd188b --- /dev/null +++ b/include/arch/arm/irq.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ */ diff --git a/include/arch/arm/misc.h b/include/arch/arm/misc.h new file mode 100644 index 00000000000..8e0fe11f674 --- /dev/null +++ b/include/arch/arm/misc.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ */ diff --git a/include/arch/arm/nmi.h b/include/arch/arm/nmi.h new file mode 100644 index 00000000000..0d1f9c43c53 --- /dev/null +++ b/include/arch/arm/nmi.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ */ diff --git a/include/arch/arm/syscall.h b/include/arch/arm/syscall.h new file mode 100644 index 00000000000..80542f06a38 --- /dev/null +++ b/include/arch/arm/syscall.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ */ diff --git a/include/arch/arm/thread.h b/include/arch/arm/thread.h new file mode 100644 index 00000000000..4b2c8fdc5b2 --- /dev/null +++ b/include/arch/arm/thread.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2019 Carlo Caione + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ +#define ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ + +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." +#endif + +#include + +#endif /* ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ */