summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-25 09:13:52 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-25 09:14:13 +0200
commitbbe01982c069994ebe5dc74019c86c0b2ed1cedb (patch)
tree27b911d5d4018076257750e87709ca1493a215cb /target
parent6bedec9d6fb16bcf71c8e942a26a169edf47b199 (diff)
make bootup really quiet
Diffstat (limited to 'target')
-rw-r--r--target/Makefile6
-rw-r--r--target/config/Config.in.runtime17
-rw-r--r--target/linux/config/Config.in.debug7
3 files changed, 17 insertions, 13 deletions
diff --git a/target/Makefile b/target/Makefile
index 9f97d242a..1ac375b62 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -54,8 +54,12 @@ ifneq ($(ADK_PACKAGE_CRYPTINIT_ROOT),)
@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_PACKAGE_CMDLINE}"#' \
${BUILD_DIR}/.kernelconfig.board
endif
+ifeq ($(ADK_RUNTIME_QUIET_INIT),y)
+ @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 rcquiet=1"#' \
+ ${BUILD_DIR}/.kernelconfig.board
+endif
ifeq ($(ADK_QUIET_KERNEL),y)
- @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 quiet"#' \
+ @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 quiet loglevel=2"#' \
${BUILD_DIR}/.kernelconfig.board
endif
ifeq ($(ADK_KERNEL_DEBUG_WITH_KGDB),y)
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index e3f674d78..fdcc3fa6b 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -22,7 +22,7 @@ config ADK_RUNTIME_PASSWORD
Predefine the root password enabled in the built image.
config ADK_RUNTIME_START_SERVICES
- prompt "start some services by default"
+ prompt "start services by default"
boolean
default n
help
@@ -47,8 +47,15 @@ config ADK_RUNTIME_TIMEZONE
help
Predefine the timezone for the embedded system.
+config ADK_QUIET_KERNEL
+ prompt "make bootup quiet without messages from the kernel"
+ boolean
+ default n
+ help
+ Make bootup quiet without messages from the kernel.
+
choice
-prompt "Enable verbose bootup messages from initscripts"
+prompt "bootup messages from initscripts"
default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA
default ADK_RUNTIME_VERBOSE_INIT_SERIAL
@@ -65,7 +72,7 @@ config ADK_RUNTIME_QUIET_INIT
endchoice
choice
-prompt "Start getty or shell after bootup"
+prompt "start getty or shell after bootup"
default ADK_RUNTIME_SHELL if ADK_PKG_TEST
default ADK_RUNTIME_GETTY
@@ -129,7 +136,7 @@ config ADK_RUNTIME_KBD_LAYOUT
Predefine the keyboard layout for the embedded system.
choice
-prompt "Initial login shell for the root user"
+prompt "initial login shell for the root user"
default ADK_ROOTSH_MKSH
config ADK_ROOTSH_MKSH
@@ -169,7 +176,7 @@ config ADK_ROOTSH_ZSH
endchoice
choice
-prompt "System /bin/sh (POSIX script shell)"
+prompt "system /bin/sh (POSIX script shell)"
default ADK_BINSH_MKSH
config ADK_BINSH_MKSH
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 1d66ba986..b5bfea3e3 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -18,13 +18,6 @@ config ADK_KERNEL_KGDB_SERIAL_CONSOLE
config ADK_KERNEL_FRAME_POINTER
boolean
-config ADK_QUIET_KERNEL
- prompt "Make bootup quiet without messages from the kernel"
- boolean
- default n
- help
- Make bootup quiet without messages from the kernel.
-
config ADK_KERNEL_EARLY_PRINTK
boolean
default n