From 32cee88357546ca4c3352b1691b05059f086bf74 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 15 Nov 2021 19:15:27 +0100 Subject: config: CONFIGURE_DISABLE_BSP_SETTINGS Evaluate CONFIGURE_DISABLE_BSP_SETTINGS for each affected application configuration option. This makes the code easier to review since the influence of CONFIGURE_DISABLE_BSP_SETTINGS is locally visible in the code. Update #3875. --- cpukit/include/rtems/confdefs/percpu.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'cpukit/include/rtems/confdefs/percpu.h') diff --git a/cpukit/include/rtems/confdefs/percpu.h b/cpukit/include/rtems/confdefs/percpu.h index 3bea8340cb..b91590bfd9 100644 --- a/cpukit/include/rtems/confdefs/percpu.h +++ b/cpukit/include/rtems/confdefs/percpu.h @@ -78,7 +78,8 @@ extern "C" { /* Interrupt stack configuration */ #ifndef CONFIGURE_INTERRUPT_STACK_SIZE - #ifdef BSP_INTERRUPT_STACK_SIZE + #if !defined(CONFIGURE_DISABLE_BSP_SETTINGS) && \ + defined(BSP_INTERRUPT_STACK_SIZE) #define CONFIGURE_INTERRUPT_STACK_SIZE BSP_INTERRUPT_STACK_SIZE #else #define CONFIGURE_INTERRUPT_STACK_SIZE CPU_STACK_MINIMUM_SIZE @@ -121,7 +122,8 @@ RTEMS_DEFINE_GLOBAL_SYMBOL( /* Idle thread configuration */ #ifndef CONFIGURE_IDLE_TASK_STACK_SIZE - #ifdef BSP_IDLE_TASK_STACK_SIZE + #if !defined(CONFIGURE_DISABLE_BSP_SETTINGS) && \ + defined(BSP_IDLE_TASK_STACK_SIZE) #define CONFIGURE_IDLE_TASK_STACK_SIZE BSP_IDLE_TASK_STACK_SIZE #else #define CONFIGURE_IDLE_TASK_STACK_SIZE CONFIGURE_MINIMUM_TASK_STACK_SIZE @@ -153,7 +155,8 @@ const size_t _Thread_Idle_stack_size = CONFIGURE_IDLE_TASK_STACK_SIZE; #error "If you define CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION, then you must define CONFIGURE_IDLE_TASK_BODY as well" #endif -#if !defined(CONFIGURE_IDLE_TASK_BODY) && defined(BSP_IDLE_TASK_BODY) +#if !defined(CONFIGURE_IDLE_TASK_BODY) && \ + !defined(CONFIGURE_DISABLE_BSP_SETTINGS) && defined(BSP_IDLE_TASK_BODY) #define CONFIGURE_IDLE_TASK_BODY BSP_IDLE_TASK_BODY #endif -- cgit v1.2.3