Browse Source
It doesn't make sense to keep the aarch32 directory in the
'arch/arm/core' directory as the aarch64 has been moved out.
This commit introduces the following major changes.
1. Move all directories and files in 'arch/arm/core/aarch32' to
'arch/arm/core' and remove the 'arch/arm/core/aarch32' directory.
2. Move all directories and files in 'arch/include/aarch32' to
'arch/include' and remove the 'arch/include/aarch32' directory.
3. Remove the nested including in the 'arch/include/kernel_arch_func.h'
and 'arch/include/offsets_short_arch.h' header files.
4. Change the path string which is influenced by the changement 1
and 2.
Signed-off-by: Huifeng Zhang <Huifeng.Zhang@arm.com>
pull/62165/head
Huifeng Zhang
2 years ago
committed by
Fabio Baltieri
108 changed files with 176 additions and 200 deletions
@ -1,93 +0,0 @@ |
|||||||
/*
|
|
||||||
* Copyright (c) 2013-2016 Wind River Systems, Inc. |
|
||||||
* |
|
||||||
* SPDX-License-Identifier: Apache-2.0 |
|
||||||
*/ |
|
||||||
|
|
||||||
/**
|
|
||||||
* @file |
|
||||||
* @brief Private kernel definitions (ARM) |
|
||||||
* |
|
||||||
* This file contains private kernel function definitions and various |
|
||||||
* other definitions for the 32-bit ARM Cortex-A/R/M processor architecture |
|
||||||
* family. |
|
||||||
* |
|
||||||
* This file is also included by assembly language files which must #define |
|
||||||
* _ASMLANGUAGE before including this header file. Note that kernel |
|
||||||
* assembly source files obtains structure offset values via "absolute symbols" |
|
||||||
* in the offsets.o module. |
|
||||||
*/ |
|
||||||
|
|
||||||
#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_KERNEL_ARCH_FUNC_H_ |
|
||||||
#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_KERNEL_ARCH_FUNC_H_ |
|
||||||
|
|
||||||
#include <kernel_arch_data.h> |
|
||||||
|
|
||||||
#ifdef __cplusplus |
|
||||||
extern "C" { |
|
||||||
#endif |
|
||||||
|
|
||||||
#ifndef _ASMLANGUAGE |
|
||||||
extern void z_arm_fault_init(void); |
|
||||||
extern void z_arm_cpu_idle_init(void); |
|
||||||
#ifdef CONFIG_ARM_MPU |
|
||||||
extern void z_arm_configure_static_mpu_regions(void); |
|
||||||
extern void z_arm_configure_dynamic_mpu_regions(struct k_thread *thread); |
|
||||||
extern int z_arm_mpu_init(void); |
|
||||||
#endif /* CONFIG_ARM_MPU */ |
|
||||||
#ifdef CONFIG_ARM_AARCH32_MMU |
|
||||||
extern int z_arm_mmu_init(void); |
|
||||||
#endif /* CONFIG_ARM_AARCH32_MMU */ |
|
||||||
|
|
||||||
static ALWAYS_INLINE void arch_kernel_init(void) |
|
||||||
{ |
|
||||||
z_arm_interrupt_stack_setup(); |
|
||||||
z_arm_exc_setup(); |
|
||||||
z_arm_fault_init(); |
|
||||||
z_arm_cpu_idle_init(); |
|
||||||
z_arm_clear_faults(); |
|
||||||
#if defined(CONFIG_ARM_MPU) |
|
||||||
z_arm_mpu_init(); |
|
||||||
/* Configure static memory map. This will program MPU regions,
|
|
||||||
* to set up access permissions for fixed memory sections, such |
|
||||||
* as Application Memory or No-Cacheable SRAM area. |
|
||||||
* |
|
||||||
* This function is invoked once, upon system initialization. |
|
||||||
*/ |
|
||||||
z_arm_configure_static_mpu_regions(); |
|
||||||
#endif /* CONFIG_ARM_MPU */ |
|
||||||
#if defined(CONFIG_ARM_AARCH32_MMU) |
|
||||||
z_arm_mmu_init(); |
|
||||||
#endif /* CONFIG_ARM_AARCH32_MMU */ |
|
||||||
} |
|
||||||
|
|
||||||
static ALWAYS_INLINE void |
|
||||||
arch_thread_return_value_set(struct k_thread *thread, unsigned int value) |
|
||||||
{ |
|
||||||
thread->arch.swap_return_value = value; |
|
||||||
} |
|
||||||
|
|
||||||
#if !defined(CONFIG_MULTITHREADING) && defined(CONFIG_CPU_CORTEX_M) |
|
||||||
extern FUNC_NORETURN void z_arm_switch_to_main_no_multithreading( |
|
||||||
k_thread_entry_t main_func, |
|
||||||
void *p1, void *p2, void *p3); |
|
||||||
|
|
||||||
#define ARCH_SWITCH_TO_MAIN_NO_MULTITHREADING \ |
|
||||||
z_arm_switch_to_main_no_multithreading |
|
||||||
|
|
||||||
#endif /* !CONFIG_MULTITHREADING && CONFIG_CPU_CORTEX_M */ |
|
||||||
|
|
||||||
extern FUNC_NORETURN void z_arm_userspace_enter(k_thread_entry_t user_entry, |
|
||||||
void *p1, void *p2, void *p3, |
|
||||||
uint32_t stack_end, |
|
||||||
uint32_t stack_start); |
|
||||||
|
|
||||||
extern void z_arm_fatal_error(unsigned int reason, const z_arch_esf_t *esf); |
|
||||||
|
|
||||||
#endif /* _ASMLANGUAGE */ |
|
||||||
|
|
||||||
#ifdef __cplusplus |
|
||||||
} |
|
||||||
#endif |
|
||||||
|
|
||||||
#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_KERNEL_ARCH_FUNC_H_ */ |
|
||||||
@ -1,57 +0,0 @@ |
|||||||
/*
|
|
||||||
* Copyright (c) 2016 Wind River Systems, Inc. |
|
||||||
* |
|
||||||
* SPDX-License-Identifier: Apache-2.0 |
|
||||||
*/ |
|
||||||
|
|
||||||
#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_OFFSETS_SHORT_ARCH_H_ |
|
||||||
#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_OFFSETS_SHORT_ARCH_H_ |
|
||||||
|
|
||||||
#include <offsets.h> |
|
||||||
|
|
||||||
/* kernel */ |
|
||||||
|
|
||||||
/* nothing for now */ |
|
||||||
|
|
||||||
/* end - kernel */ |
|
||||||
|
|
||||||
/* threads */ |
|
||||||
|
|
||||||
#define _thread_offset_to_basepri \ |
|
||||||
(___thread_t_arch_OFFSET + ___thread_arch_t_basepri_OFFSET) |
|
||||||
|
|
||||||
#define _thread_offset_to_preempt_float \ |
|
||||||
(___thread_t_arch_OFFSET + ___thread_arch_t_preempt_float_OFFSET) |
|
||||||
|
|
||||||
#if defined(CONFIG_USERSPACE) || defined(CONFIG_FPU_SHARING) |
|
||||||
#define _thread_offset_to_mode \ |
|
||||||
(___thread_t_arch_OFFSET + ___thread_arch_t_mode_OFFSET) |
|
||||||
#endif |
|
||||||
|
|
||||||
#if defined(CONFIG_ARM_STORE_EXC_RETURN) |
|
||||||
#define _thread_offset_to_mode_exc_return \ |
|
||||||
(___thread_t_arch_OFFSET + ___thread_arch_t_mode_exc_return_OFFSET) |
|
||||||
#endif |
|
||||||
|
|
||||||
#ifdef CONFIG_USERSPACE |
|
||||||
#define _thread_offset_to_priv_stack_start \ |
|
||||||
(___thread_t_arch_OFFSET + ___thread_arch_t_priv_stack_start_OFFSET) |
|
||||||
|
|
||||||
#if defined(CONFIG_CPU_AARCH32_CORTEX_R) |
|
||||||
#define _thread_offset_to_priv_stack_end \ |
|
||||||
(___thread_t_arch_OFFSET + ___thread_arch_t_priv_stack_end_OFFSET) |
|
||||||
|
|
||||||
#define _thread_offset_to_sp_usr \ |
|
||||||
(___thread_t_arch_OFFSET + ___thread_arch_t_sp_usr_OFFSET) |
|
||||||
#endif |
|
||||||
#endif |
|
||||||
|
|
||||||
#if defined(CONFIG_THREAD_STACK_INFO) |
|
||||||
#define _thread_offset_to_stack_info_start \ |
|
||||||
(___thread_stack_info_t_start_OFFSET + ___thread_t_stack_info_OFFSET) |
|
||||||
#endif |
|
||||||
|
|
||||||
|
|
||||||
/* end - threads */ |
|
||||||
|
|
||||||
#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_OFFSETS_SHORT_ARCH_H_ */ |
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue