michaelh/zephyr
1
0
Fork 0
Code Releases Activity

nios2: get CPU features from ALT_CPU_* namespace

Browse source 
NIOS2_* namespace is deprecated.

Change-Id: I5a9b07ee33b20aa18509e9d789837f48199ab25d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2016-07-11 12:42:02 -07:00 • committed by Inaky Perez-Gonzalez
commit 0b6c4febf1
7 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch/nios2/core/swap.S
View file

@ -108,10 +108,10 @@ BRANCH_LABEL(next_chosen)
* key was supplied as argument to _Swap()
*/
ldw r3, __tTCS_coopReg_OFFSET + __t_coop_key_OFFSET(r11)
#if (NIOS2_NUM_OF_SHADOW_REG_SETS > 0) || \
(defined NIOS2_EIC_PRESENT) || \
(defined NIOS2_MMU_PRESENT) || \
(defined NIOS2_MPU_PRESENT)
#if (ALT_CPU_NUM_OF_SHADOW_REG_SETS > 0) || \
(defined ALT_CPU_EIC_PRESENT) || \
(defined ALT_CPU_MMU_PRESENT) || \
(defined ALT_CPU_MPU_PRESENT)
andi r3, r3, NIOS2_STATUS_PIE_MSK
beq r3, zero, no_unlock
rdctl r3, status