diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-08 20:17:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-08 20:17:09 +0100 |
| commit | 14443d9ed7d0bc0ab87274f9f0f0d2d4c1b6f161 (patch) | |
| tree | cf354128a36921387f6fd9f9f892251cc749074b /target/config | |
| parent | 6b4718e4ac35b741141bbaa4c0836d77b22cc02f (diff) | |
| parent | 09340685c13fcc7d32a3c8a4153e0e73166897b9 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 2 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 5c5f1b6fd..c50fbd289 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -241,6 +241,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_INPUT_MOUSE select ADK_KERNEL_INPUT_MOUSEDEV + select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB endchoice @@ -619,6 +620,7 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686 + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_X86_64 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SPARC64 default "console=ttyS0,9600 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC default "console=hvc0 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC64 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 03cecfca1..3634564ed 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -38,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE choice prompt "Console output on embedded system" -default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && ADK_TARGET_QEMU_WITH_GRAPHIC -default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG +default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG +default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_LEMOTE_YEELONG default ADK_RUNTIME_CONSOLE_SERIAL config ADK_RUNTIME_CONSOLE_VGA |