From 622e273d089423b4834443f2ca44bd3beaebd9c8 Mon Sep 17 00:00:00 2001 From: Juan Manuel Cruz Date: Thu, 30 Apr 2015 15:13:04 -0500 Subject: [PATCH] Kbuild: Sysgen support for NUM_TASK_PRIORITIES This commit add support to the Kbuild system for the NUM_TASK_PRIORITIES Kconfig symbol and the corresponding sysgen parameter. Change-Id: I6b035437c86d62f72c25d696d18182a7b0448e8f Signed-off-by: Juan Manuel Cruz --- arch/arm/configs/micro_fsl_frdm_k64f_defconfig | 1 + arch/arm/configs/micro_ti_lm3s6965_defconfig | 1 + arch/arm/defconfig | 1 + arch/x86/configs/micro_generic_pc_defconfig | 1 + arch/x86/configs/micro_quark_defconfig | 1 + arch/x86/defconfig | 1 + kernel/microkernel/core/Kconfig | 13 +++++++++++++ scripts/Makefile.preparch | 5 ++--- 8 files changed, 21 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig index 80fb4918bea..e0b7a51bccf 100644 --- a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig +++ b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig @@ -34,6 +34,7 @@ CONFIG_PRIORITY_CEILING=0 CONFIG_COMMAND_STACK_SIZE=64 CONFIG_NUM_COMMAND_PACKETS=16 CONFIG_NUM_TIMER_PACKETS=10 +CONFIG_NUM_TASK_PRIORITIES=16 CONFIG_API_MEMMAP=y CONFIG_API_MEMPOOL=y CONFIG_API_TASKIRQ=y diff --git a/arch/arm/configs/micro_ti_lm3s6965_defconfig b/arch/arm/configs/micro_ti_lm3s6965_defconfig index 8057e9c9766..113c790433f 100644 --- a/arch/arm/configs/micro_ti_lm3s6965_defconfig +++ b/arch/arm/configs/micro_ti_lm3s6965_defconfig @@ -34,6 +34,7 @@ CONFIG_PRIORITY_CEILING=0 CONFIG_COMMAND_STACK_SIZE=64 CONFIG_NUM_COMMAND_PACKETS=16 CONFIG_NUM_TIMER_PACKETS=10 +CONFIG_NUM_TASK_PRIORITIES=16 CONFIG_API_MEMMAP=y CONFIG_API_MEMPOOL=y CONFIG_API_TASKIRQ=y diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 80fb4918bea..e0b7a51bccf 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -34,6 +34,7 @@ CONFIG_PRIORITY_CEILING=0 CONFIG_COMMAND_STACK_SIZE=64 CONFIG_NUM_COMMAND_PACKETS=16 CONFIG_NUM_TIMER_PACKETS=10 +CONFIG_NUM_TASK_PRIORITIES=16 CONFIG_API_MEMMAP=y CONFIG_API_MEMPOOL=y CONFIG_API_TASKIRQ=y diff --git a/arch/x86/configs/micro_generic_pc_defconfig b/arch/x86/configs/micro_generic_pc_defconfig index 61421ab1f5b..fe59009a7cd 100644 --- a/arch/x86/configs/micro_generic_pc_defconfig +++ b/arch/x86/configs/micro_generic_pc_defconfig @@ -40,6 +40,7 @@ CONFIG_PRIORITY_CEILING=0 CONFIG_COMMAND_STACK_SIZE=64 CONFIG_NUM_COMMAND_PACKETS=16 CONFIG_NUM_TIMER_PACKETS=10 +CONFIG_NUM_TASK_PRIORITIES=16 CONFIG_API_MEMMAP=y CONFIG_API_MEMPOOL=y CONFIG_API_TASKIRQ=y diff --git a/arch/x86/configs/micro_quark_defconfig b/arch/x86/configs/micro_quark_defconfig index e171543bf91..21828f49a4a 100644 --- a/arch/x86/configs/micro_quark_defconfig +++ b/arch/x86/configs/micro_quark_defconfig @@ -40,6 +40,7 @@ CONFIG_PRIORITY_CEILING=0 CONFIG_COMMAND_STACK_SIZE=64 CONFIG_NUM_COMMAND_PACKETS=16 CONFIG_NUM_TIMER_PACKETS=10 +CONFIG_NUM_TASK_PRIORITIES=16 CONFIG_API_MEMMAP=y CONFIG_API_MEMPOOL=y CONFIG_API_TASKIRQ=y diff --git a/arch/x86/defconfig b/arch/x86/defconfig index 61421ab1f5b..fe59009a7cd 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -40,6 +40,7 @@ CONFIG_PRIORITY_CEILING=0 CONFIG_COMMAND_STACK_SIZE=64 CONFIG_NUM_COMMAND_PACKETS=16 CONFIG_NUM_TIMER_PACKETS=10 +CONFIG_NUM_TASK_PRIORITIES=16 CONFIG_API_MEMMAP=y CONFIG_API_MEMPOOL=y CONFIG_API_TASKIRQ=y diff --git a/kernel/microkernel/core/Kconfig b/kernel/microkernel/core/Kconfig index 824fa199dc3..c3fd797605c 100644 --- a/kernel/microkernel/core/Kconfig +++ b/kernel/microkernel/core/Kconfig @@ -72,4 +72,17 @@ config NUM_TIMER_PACKETS help This option specifies the number of timer packets to create. Each explicit and implicit timer usage consumes one timer packet. + +config NUM_TASK_PRIORITIES + int + prompt "Number of task priorities" + default 16 + range 1 256 + depends on MICROKERNEL + help + This option specifies the number of task priorities supported by the + task scheduler. Specifying "N" provides support for task priorities + ranging from 0 (highest) through N-2; task priority N-1 (lowest) is + reserved for the kernel's idle task. + endmenu diff --git a/scripts/Makefile.preparch b/scripts/Makefile.preparch index 5a16845a156..9f1a3d7626a 100644 --- a/scripts/Makefile.preparch +++ b/scripts/Makefile.preparch @@ -7,10 +7,9 @@ endif define filechk_prj.vpf (echo "% WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!"; \ echo; \ - echo "% NODE NAME NLINAME NDPACKS NCPACKS NTIMERS KSTACK"; \ - echo "% CONFIG NUM_COMMAND_PACKETS NUM_TIMER_PACKETS"; \ + echo "% CONFIG NUM_COMMAND_PACKETS NUM_TIMER_PACKETS NUM_TASK_PRIORITIES"; \ echo "% ============================================================="; \ - echo " CONFIG ${CONFIG_NUM_COMMAND_PACKETS} ${CONFIG_NUM_TIMER_PACKETS}"; \ + echo " CONFIG ${CONFIG_NUM_COMMAND_PACKETS} ${CONFIG_NUM_TIMER_PACKETS} ${CONFIG_NUM_TASK_PRIORITIES}"; \ echo; \ echo "% TASKGROUP NAME";\ echo "% ==============";\