From 4acde800b02be0a36f39a102e589656f743ac56d Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 10 May 2015 07:59:05 -0400 Subject: [PATCH] Kbuild: User kernel instead of TiMo TiMo is very ambigous, be generic and call it kernel. Change-Id: I66b3e436afbc89e874f31a89b98cc04aa821c787 Signed-off-by: Anas Nashif --- Kconfig | 4 ++-- Makefile.inc | 1 + arch/arm/bsp/CortexM/Kconfig | 2 +- arch/x86/bsp/Kconfig | 2 +- arch/x86/core/Kconfig | 4 ++-- arch/x86/quark/Kconfig | 12 ++++++------ kernel/Kconfig | 2 +- lib/libc/Makefile | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Kconfig b/Kconfig index f9b7bc73a20..9cf87d14aee 100644 --- a/Kconfig +++ b/Kconfig @@ -61,7 +61,7 @@ config BOOT_TIME_MEASUREMENT depends on EXPERIMENTAL help This option enables the recording of timestamps during system start - up. The global variable __start_tsc records the time TiMo begins + up. The global variable __start_tsc records the time kernel begins executing, while __main_tsc records when main() begins executing, and __idle_tsc records when the CPU becomes idle. All values are recorded in terms of CPU clock cycles since system reset. @@ -87,7 +87,7 @@ config COMPILER_OPT This option is a free-form string that is passed to the compiler when building all parts of a project (i.e. kernel, LKMs, and USAPs). The compiler options specified by this string supplement the - pre-defined set of compiler supplied by the TiMo build system, + pre-defined set of compiler supplied by the build system, and can be used to change compiler optimization, warning and error messages, and so on. diff --git a/Makefile.inc b/Makefile.inc index c6220018702..e90b53b388f 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -18,6 +18,7 @@ endif ifndef SOURCE_DIR SOURCE_DIR=$(PROJECT_BASE)/src/ +export SOURCE_DIR endif CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ diff --git a/arch/arm/bsp/CortexM/Kconfig b/arch/arm/bsp/CortexM/Kconfig index 0ffc8a574a1..4ba3a7ba9c3 100644 --- a/arch/arm/bsp/CortexM/Kconfig +++ b/arch/arm/bsp/CortexM/Kconfig @@ -91,7 +91,7 @@ config RUNTIME_NMI prompt "Attach an NMI handler at runtime" default n help - TiMo provides a simple NMI handler that simply hangs in a tight + The kernel provides a simple NMI handler that simply hangs in a tight loop if triggered. This fills the requirement that there must be an NMI handler installed when the CPU boots. If a custom handler is needed, enable this option and attach it via _NmiHandlerSet(). diff --git a/arch/x86/bsp/Kconfig b/arch/x86/bsp/Kconfig index a76146bff40..c15893acf8f 100644 --- a/arch/x86/bsp/Kconfig +++ b/arch/x86/bsp/Kconfig @@ -184,7 +184,7 @@ config DYNAMIC_INT_STUBS help This option allows a BSP's drivers to install interrupt handlers at run time, if desired. If not enabled, interrupt handlers can only - be installed statically when the TiMo image is created. + be installed statically when the image is created. config PROT_MODE_SWITCH_PROMPT bool "Prot Mode switch prompt" diff --git a/arch/x86/core/Kconfig b/arch/x86/core/Kconfig index 524617ef2da..04dba9bce07 100644 --- a/arch/x86/core/Kconfig +++ b/arch/x86/core/Kconfig @@ -44,7 +44,7 @@ config BOI_HANDLER_SUPPORTED help This option signifies that the target has one or more devices whose driver utilizes a "beginning of interrupt" handler that gets called - before TiMo's standard interrupt handling code. This capability + before the standard interrupt handling code. This capability can be used by the driver to suppress spurious interrupts generated by the device (or for other purposes). @@ -54,7 +54,7 @@ config EOI_HANDLER_SUPPORTED help This option signifies that the target has one or more devices whose driver utilizes an "end of interrupt" handler that gets called - after TiMo's standard interrupt handling code. This capability + after the standard interrupt handling code. This capability can be used by the driver to tell the device that an interrupt has been handled (or for other purposes). diff --git a/arch/x86/quark/Kconfig b/arch/x86/quark/Kconfig index 1e23e592df1..95c8ff276fb 100644 --- a/arch/x86/quark/Kconfig +++ b/arch/x86/quark/Kconfig @@ -15,20 +15,20 @@ config MAX_PCI_DEVS config BOOTLOADER_KEXEC bool - prompt "TiMo boots using Linux kexec() system call" + prompt "Boot using Linux kexec() system call" default n help - This option signifies that Linux boots TiMo using kexec system call - and utility. This method is used to boot TiMo over the network. + This option signifies that Linux boots the kernel using kexec system call + and utility. This method is used to boot the kernel over the network. config BOOTLOADER_GRUB bool - prompt "TiMo boots using GRUB 2.0" + prompt "Boot using GRUB 2.0" default y depends on !BOOTLOADER_KEXEC help - This option signifies that GRUB 2.0 is used to boot TiMo. GRUB 2.0 - is used to boot TiMo from SD card. + This option signifies that GRUB 2.0 is used to boot the kernel. GRUB 2.0 + is used to boot the kernel from SD card. config PHYS_LOAD_ADDR default 0x00100000 diff --git a/kernel/Kconfig b/kernel/Kconfig index e9d3e8be2d3..222d6b9c737 100644 --- a/kernel/Kconfig +++ b/kernel/Kconfig @@ -62,7 +62,7 @@ config ENHANCED_SECURITY default y if ARCH="x86" default n help - This option enables all security features supported by TiMo, + This option enables all security features supported by the kernel, including those that can have a significant impact on system footprint or performance; it also prevents the use of certain kernel features that have known security risks. diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 6f96f9a3869..43b69c01c1a 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,5 +1,5 @@ #FIXME This Makefile is skipping one level of recursivity # to avoid modifyng the file source/Makefile that -# is needed by the current TiMo build system. +# is needed by the current build system. obj-y = minimal/source/