Skip to content

Commit 2e33d5e

Browse files
committed
nuttx/arch: remove the custom board check in up_testset implementation
the up_testset implementation is common code, should not add custom board check Signed-off-by: guoshichao <guoshichao@xiaomi.com>
1 parent 825ba8e commit 2e33d5e

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

arch/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,10 @@ config ARCH_HAVE_TESTSET
489489
bool
490490
default n
491491

492+
config ARCH_HAVE_CUSTOM_TESTSET
493+
bool
494+
default n
495+
492496
config ARCH_HAVE_THREAD_LOCAL
493497
bool
494498
default n

arch/arm/Kconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ config ARCH_CHIP_LC823450
221221
select ARCH_HAVE_HEAPCHECK
222222
select ARCH_HAVE_MULTICPU
223223
select ARCH_HAVE_I2CRESET
224+
select ARCH_HAVE_CUSTOM_TESTSET
224225
select ARCH_HAVE_CUSTOM_VECTORS
225226
---help---
226227
ON Semiconductor LC823450 architectures (ARM dual Cortex-M3)
@@ -344,11 +345,11 @@ config ARCH_CHIP_RP2040
344345
select ARCH_CORTEXM0
345346
select ARCH_HAVE_RAMVECTORS
346347
select ARCH_HAVE_MULTICPU
347-
select ARCH_HAVE_TESTSET
348348
select ARCH_HAVE_I2CRESET
349349
select ARM_HAVE_WFE_SEV
350350
select ARCH_HAVE_PWM_MULTICHAN
351351
select ARCH_BOARD_COMMON
352+
select ARCH_HAVE_CUSTOM_TESTSET
352353
select ARCH_HAVE_CUSTOM_VECTORS
353354
---help---
354355
Raspberry Pi RP2040 architectures (ARM dual Cortex-M0+).
@@ -358,9 +359,9 @@ config ARCH_CHIP_RP23XX
358359
select ARCH_CORTEXM33
359360
select ARCH_HAVE_RAMVECTORS
360361
select ARCH_HAVE_MULTICPU
361-
select ARCH_HAVE_TESTSET
362362
select ARCH_HAVE_I2CRESET
363363
select ARM_HAVE_WFE_SEV
364+
select ARCH_HAVE_CUSTOM_TESTSET
364365
select ARCH_HAVE_PWM_MULTICHAN
365366
select ARCH_BOARD_COMMON
366367
---help---
@@ -684,6 +685,7 @@ config ARCH_CHIP_CXD56XX
684685
select ARCH_HAVE_SDIO if MMCSD
685686
select ARCH_HAVE_MATH_H
686687
select ARCH_HAVE_I2CRESET
688+
select ARCH_HAVE_CUSTOM_TESTSET
687689
select ARCH_HAVE_CUSTOM_VECTORS
688690
select LIBC_ARCH_ATOMIC if SMP
689691
---help---

arch/arm/include/spinlock.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,7 @@ typedef uint8_t spinlock_t;
114114
*
115115
****************************************************************************/
116116

117-
#if defined(CONFIG_ARCH_HAVE_TESTSET) \
118-
&& !defined(CONFIG_ARCH_CHIP_LC823450) \
119-
&& !defined(CONFIG_ARCH_CHIP_CXD56XX) \
120-
&& !defined(CONFIG_ARCH_CHIP_RP2040) \
121-
&& !defined(CONFIG_ARCH_CHIP_RP23XX)
117+
#if defined(CONFIG_ARCH_HAVE_TESTSET) && !defined(CONFIG_ARCH_HAVE_CUSTOM_TESTSET)
122118
static inline_function spinlock_t up_testset(volatile spinlock_t *lock)
123119
{
124120
spinlock_t ret = SP_UNLOCKED;

sched/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ config SMP
365365
bool "Symmetric Multi-Processing (SMP)"
366366
default n
367367
depends on ARCH_HAVE_MULTICPU
368-
depends on ARCH_HAVE_TESTSET
368+
depends on ARCH_HAVE_TESTSET || ARCH_HAVE_CUSTOM_TESTSET
369369
depends on ARCH_INTERRUPTSTACK != 0
370370
select SPINLOCK
371371
select IRQCOUNT

0 commit comments

Comments
 (0)