diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 04:48:26 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 04:50:37 -0600 |
| commit | 5dce6450cf93bde8816892db3f67d74b9947b209 (patch) | |
| tree | 991054ee6093dd8fd4e0ff7262a7868c6b3ebc4d /target/Makefile | |
| parent | de7c7901a87c27f80bf562a1f1797c838fa6efe0 (diff) | |
rework VGA and serial output
The Linux kernel can output messages to serial devices and
vga devices in parallel. The latest console= entry decides which
console output is used for init via /dev/console character device.
Let the developer configure what he wants. If you use f.e. Kodi,
be sure output/input is used for VGA, other wise kodi startsup,
but you end up with a black screen.
Diffstat (limited to 'target/Makefile')
| -rw-r--r-- | target/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/target/Makefile b/target/Makefile index 3a90413ea..4a497b80b 100644 --- a/target/Makefile +++ b/target/Makefile @@ -36,12 +36,20 @@ config-prepare: $(ADK_TOPDIR)/.config echo "no miniconfig found for target system"; \ exit 1; \ fi -ifneq ($(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),) +ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y) + $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) consoleblank=0"#' \ + $(BUILD_DIR)/.kernelconfig.board +endif +ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y) $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)"#' \ $(BUILD_DIR)/.kernelconfig.board endif -ifneq ($(ADK_RUNTIME_CONSOLE_VGA_DEVICE),) - $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE)" consoleblank=0#' \ +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)"#' \ + $(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"#' \ $(BUILD_DIR)/.kernelconfig.board endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K),y) @@ -70,7 +78,7 @@ ifeq ($(ADK_RUNTIME_QUIET_INIT),y) @$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 rcquiet=1"#' \ $(BUILD_DIR)/.kernelconfig.board endif -ifeq ($(ADK_QUIET_KERNEL),y) +ifeq ($(ADK_RUNTIME_QUIET_KERNEL),y) @$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 quiet loglevel=2 vt.global_cursor_default=0"#' \ $(BUILD_DIR)/.kernelconfig.board endif |