michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ARC: Kconfig: rename CPU_ARCV2 option to ISA_ARCV2

Browse source 
* Rename CPU_ARCV2 to ISA_ARCV2. That helps to avoid conflict between
  CPU families naming and ISAs naming and aligns this options
  with other ARC OSS projects.

* Generalize ARCV2 check to ARC check where it is required.

NOTE: we add ISA_ARCV2 option in a choice list as a preparation
for ISA_ARCV3 addition.

Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
This commit is contained in:
Eugeniy Paltsev 2021-03-20 01:34:01 +03:00 • committed by Anas Nashif
commit 1b41da2630
9 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
arch/arc/Kconfig
View file

@ -26,6 +26,23 @@ config CPU_ARCHS
This option signifies the use of an ARC HS CPU
choice
prompt "ARC Instruction Set"
default ISA_ARCV2
config ISA_ARCV2
bool "ARC ISA v2"
select ARCH_HAS_STACK_PROTECTION if ARC_HAS_STACK_CHECKING || (ARC_MPU && ARC_MPU_VER !=2)
select ARCH_HAS_USERSPACE if ARC_MPU
select USE_SWITCH
select USE_SWITCH_SUPPORTED
help
v2 ISA for the ARC-HS & ARC-EM cores
endchoice
if ISA_ARCV2
config CPU_EM4
bool
select CPU_ARCEM
@ -64,20 +81,12 @@ config CPU_HS3X
help
If y, the SoC uses an ARC HS3x or HS4x CPU
endif #ISA_ARCV2
config FP_FPU_DA
bool
menu "ARCv2 Family Options"
config CPU_ARCV2
bool
select ARCH_HAS_STACK_PROTECTION if ARC_HAS_STACK_CHECKING || (ARC_MPU && ARC_MPU_VER !=2)
select ARCH_HAS_USERSPACE if ARC_MPU
select USE_SWITCH
select USE_SWITCH_SUPPORTED
default y
help
This option signifies the use of a CPU of the ARCv2 family.
menu "ARC CPU Options"
config NUM_IRQ_PRIO_LEVELS
int "Number of supported interrupt priority levels"
@ -101,7 +110,6 @@ config NUM_IRQS
config RGF_NUM_BANKS
int "Number of General Purpose Register Banks"
depends on CPU_ARCV2
range 1 2
default 2
help

2
arch/arc/include/kernel_arch_func.h
View file

@ -24,7 +24,7 @@
#include <kernel_arch_data.h>
#ifdef CONFIG_CPU_ARCV2
#ifdef CONFIG_ISA_ARCV2
#include <v2/irq.h>
#endif

2
include/arch/arc/arch.h
View file

@ -21,7 +21,7 @@
#include <arch/common/ffs.h>
#include <arch/arc/thread.h>
#include <arch/common/sys_bitops.h>
#ifdef CONFIG_CPU_ARCV2
#ifdef CONFIG_ISA_ARCV2
#include <arch/arc/v2/exc.h>
#include <arch/arc/v2/irq.h>
#include <arch/arc/v2/error.h>

2
include/arch/arc/arch_inlines.h
View file

@ -12,7 +12,7 @@
#include <kernel_structs.h>
#ifdef CONFIG_CPU_ARCV2
#ifdef CONFIG_ISA_ARCV2
#include <arch/arc/v2/aux_regs.h>
#endif

2
include/arch/arc/syscall.h
View file

@ -26,7 +26,7 @@
#include <zephyr/types.h>
#include <stdbool.h>
#ifdef CONFIG_CPU_ARCV2
#ifdef CONFIG_ISA_ARCV2
#include <arch/arc/v2/aux_regs.h>
#endif

2
tests/kernel/fpu_sharing/generic/src/float_context.h
View file

@ -88,7 +88,7 @@ struct fp_non_volatile_register_set {
#define SIZEOF_FP_NON_VOLATILE_REGISTER_SET \
sizeof(struct fp_non_volatile_register_set)
#elif defined(CONFIG_CPU_ARCV2)
#elif defined(CONFIG_ISA_ARCV2)
struct fp_volatile_register_set {
#ifdef CONFIG_FP_FPU_DA

2
tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
View file

@ -12,7 +12,7 @@
#ifndef _FLOAT_REGS_ARC_GCC_H
#define _FLOAT_REGS_ARC_GCC_H
#if !defined(__GNUC__) || !defined(CONFIG_CPU_ARCV2)
#if !defined(__GNUC__) || !defined(CONFIG_ISA_ARCV2)
#error __FILE__ goes only with ARC GCC
#endif

2
tests/kernel/fpu_sharing/generic/src/load_store.c
View file

@ -50,7 +50,7 @@
#else
#include "float_regs_arm_other.h"
#endif /* __GNUC__ */
#elif defined(CONFIG_CPU_ARCV2)
#elif defined(CONFIG_ISA_ARCV2)
#if defined(__GNUC__)
#include "float_regs_arc_gcc.h"
#else

2
tests/kernel/fpu_sharing/generic/testcase.yaml
View file

@ -1,7 +1,7 @@
tests:
kernel.fpu_sharing.generic.arc:
extra_args: PI_NUM_ITERATIONS=500
filter: CONFIG_CPU_ARCV2 and CONFIG_CPU_HAS_FPU
filter: CONFIG_ISA_ARCV2 and CONFIG_CPU_HAS_FPU
slow: true
tags: kernel
timeout: 600