summaryrefslogtreecommitdiff
path: root/target/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2015-05-16 17:08:30 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-05-16 17:08:30 +0200
commit524958a0e7311f7b236c650738f74bf0f30c9388 (patch)
tree65adb435d11c35db048663ef54d2afcd11bbfe29 /target/Makefile
parentc7060c15345668b0b5ab6bf8c8dfeea8eacb3096 (diff)
parent1841aa8455ec17324fb7be5db48556758f140322 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/Makefile')
-rw-r--r--target/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/target/Makefile b/target/Makefile
index ddb395b55..4f63a3fb1 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -37,8 +37,12 @@ config-prepare: $(ADK_TOPDIR)/.config
exit 1; \
fi
ifneq ($(ADK_TARGET_NO_CMDLINE),y)
+ifeq ($(ADK_APPLIANCE_KODI),y)
+ $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 consoleblank=0 vt.global_cursor_default=0"#' \
+ $(BUILD_DIR)/.kernelconfig.board
+endif
ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y)
- $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) consoleblank=0"#' \
+ $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE)"#' \
$(BUILD_DIR)/.kernelconfig.board
endif
ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y)
@@ -46,11 +50,11 @@ ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y)
$(BUILD_DIR)/.kernelconfig.board
endif
ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL),y)
- $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) consoleblank=0 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)"#' \
+ $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)"#' \
$(BUILD_DIR)/.kernelconfig.board
endif
ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_VGA),y)
- $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) consoleblank=0"#' \
+ $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE)"#' \
$(BUILD_DIR)/.kernelconfig.board
endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K),y)