michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Kconfig KERNEL_DIR symbol removal.

Browse source 
This commit removes the Kconfig symbol KERNEL_DIR.
The symbols was no longer needed because sysgen is only
used on microkernel architectures and the value of
KERNEL_DIR is always "ukernel", therefore it is redundant.

Change-Id: I5e38dd431c5b6f7586e8b25aea330632e96f581f
Signed-off-by: Juan Manuel Cruz <juan.m.cruz.alcaraz@linux.intel.com>
This commit is contained in:
Juan Manuel Cruz 2015-04-27 18:36:06 -05:00 • committed by Anas Nashif
commit 2e3e28c3ed
13 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/configs/micro_fsl_frdm_k64f_defconfig
View file

@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="ukernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/arm/configs/micro_ti_lm3s6965_defconfig
View file

@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="ukernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/arm/configs/nano_fsl_frdm_k64f_defconfig
View file

@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="nkernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/arm/configs/nano_ti_lm3s6965_defconfig
View file

@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="nkernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/arm/defconfig
View file

@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="ukernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/x86/configs/micro_generic_pc_defconfig
View file

@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="ukernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/x86/configs/micro_quark_defconfig
View file

@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="ukernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/x86/configs/nano_generic_pc_defconfig
View file

@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="nkernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/x86/configs/nano_quark_defconfig
View file

@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="nkernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

1
arch/x86/defconfig
View file

@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
# #
# Nanokernel Options # Nanokernel Options
# #
CONFIG_KERNEL_DIR="ukernel"
# CONFIG_BOOT_BANNER is not set # CONFIG_BOOT_BANNER is not set
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_ISR_STACK_SIZE=2048 CONFIG_ISR_STACK_SIZE=2048

8
kernel/microkernel/Kconfig
View file

@ -2,14 +2,6 @@ menu "Microkernel Options"
source "kernel/microkernel/core/Kconfig" source "kernel/microkernel/core/Kconfig"
config KERNEL_DIR
string
default ukernel
depends on MICROKERNEL
help
This option holds the name of the directory used
by sysgen to locate the config1p.vpf file.
config WORKLOAD_MONITOR config WORKLOAD_MONITOR
bool bool
prompt "Workload monitoring [EXPERIMENTAL]" prompt "Workload monitoring [EXPERIMENTAL]"

8
kernel/nanokernel/Kconfig
View file

@ -1,13 +1,5 @@
menu "Nanokernel Options" menu "Nanokernel Options"
config KERNEL_DIR
string
default nkernel
depends on NANOKERNEL
help
This option holds the name of the directory used
by sysgen to locate the config1p.vpf file.
source "kernel/nanokernel/core/Kconfig" source "kernel/nanokernel/core/Kconfig"
endmenu endmenu

6
scripts/Makefile.preparch
View file

@ -28,11 +28,11 @@ define filechk_prj.vpf
done; \ done; \
fi; \ fi; \
cat $(PROJECT)/$(VPFILE); \ cat $(PROJECT)/$(VPFILE); \
cat $(srctree)/config/$(CONFIG_BSP_DIR)/$(CONFIG_KERNEL_DIR)/config1p.vpf;) cat $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf;)
endef endef
#Specific source code generation for Viper #Specific source code generation for Viper
misc/generated/nodes/prj.vpf: $(srctree)/config/$(CONFIG_BSP_DIR)/$(CONFIG_KERNEL_DIR)/config1p.vpf \ misc/generated/nodes/prj.vpf: $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf \
$(PROJECT)/$(VPFILE) \ $(PROJECT)/$(VPFILE) \
include/config/auto.conf FORCE include/config/auto.conf FORCE
$(call filechk,prj.vpf) $(call filechk,prj.vpf)
@ -110,4 +110,4 @@ cmd_cc_o_c = $(CC) $(KBUILD_CFLAGS) $(OFFSETS_INCLUDE) $(USERINCLUDE) -c -o $@ $
include/generated/offsets.o: $(srctree)/arch/$(SRCARCH)/core/offsets/offsets.c FORCE include/generated/offsets.o: $(srctree)/arch/$(SRCARCH)/core/offsets/offsets.c FORCE
$(call if_changed_rule,cc_o_c) $(call if_changed_rule,cc_o_c)
.PHONY: $(srctree)/config/$(CONFIG_BSP_DIR)/$(CONFIG_KERNEL_DIR)/config1p.vpf .PHONY: $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf