summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-10 12:36:04 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-10 12:36:04 +0100
commitb5fb550ce2d55156609a7549d062e10a6e9c8166 (patch)
tree78f096f1afb268ad0df14b65d104533a33586140
parent5c8e7688ee2b75354ca820778a9b5cc74f1ce934 (diff)
make printk option configurable via menuconfig
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/src/etc/init.d/boot4
-rw-r--r--target/linux/config/Config.in.debug28
-rw-r--r--target/linux/kernel.config4
4 files changed, 32 insertions, 6 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index a298d108b..f320d6b82 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 67
+PKG_RELEASE:= 68
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
PKG_BUILDDEP:= pkgconf-host file-host
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index b859d1d89..8daf52b89 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
@@ -5,7 +5,9 @@
. /etc/functions.sh
# disable kernel messages
-echo 0 > /proc/sys/kernel/printk
+if [ -f /proc/sys/kernel/printk ];then
+ echo 0 > /proc/sys/kernel/printk
+fi
# remount /dev with smaller size
mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 6236b329b..46942160f 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -25,6 +25,34 @@ config ADK_QUIET_KERNEL
help
Make bootup quiet without messages from the kernel.
+config ADK_KERNEL_EARLY_PRINTK
+ boolean
+ default n
+
+config ADK_KERNEL_PRINTK
+ prompt "Enable printk to save space and quieten bootup"
+ boolean
+ select ADK_KERNEL_EARLY_PRINTK
+ default y
+ help
+ Disable printk to save space and quieten bootup.
+
+config ADK_KERNEL_PRINTK_TIME
+ prompt "Enable timing information for printk"
+ boolean
+ depends on ADK_KERNEL_PRINTK
+ default n
+ help
+ Enable timing information for printk, to analyze kernel
+ bootup performance.
+
+config ADK_KERNEL_BUG
+ prompt "Enable BUGS() in the kernel"
+ boolean
+ default n
+ help
+ Enable if you need BUGS() in the kernel.
+
config ADK_KERNEL_NETCONSOLE
prompt "Netconsole"
boolean
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index 240ec9bf1..a28c2088b 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -28,8 +28,6 @@ CONFIG_BINFMT_SCRIPT=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_STANDALONE=y
-CONFIG_PRINTK=y
-CONFIG_BUG=n
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
@@ -40,5 +38,3 @@ CONFIG_AIO=y
CONFIG_PCI_QUIRKS=y
CONFIG_TTY=y
CONFIG_UNIX98_PTYS=y
-CONFIG_PRINTK_TIME=y
-CONFIG_EARLY_PRINTK=y