diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-21 20:26:32 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-21 20:26:32 +0100 |
| commit | 52b67695d0b2d2692893767b4fe2ef31e9e99b39 (patch) | |
| tree | a311d4a47bbc36f80a207a235a1673eaf4f7d3ac /target/config | |
| parent | dde56373e0193233bf9a9b191681d0036056f875 (diff) | |
| parent | 956aa3255fe0db46dc0175453138534237a6239c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 1 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 05f495449..6125a2c81 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -747,7 +747,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS depends on !ADK_HARDWARE_VBOX depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_KERNEL_BLK_DEV_INITRD - select ADK_KERNEL_BLK_DEV_RAM if ADK_TARGET_SYSTEM_ARANYM_M68K help create an read-only initramfs system. diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 721f623de..7acdd26ed 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -59,6 +59,7 @@ config ADK_RUNTIME_GETTY_VGA default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n help Start getty on VGA console. (tty1-tty6) @@ -69,6 +70,7 @@ config ADK_RUNTIME_GETTY_SERIAL default n if ADK_TARGET_SYSTEM_RASPBERRY_PI default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n if ADK_TARGET_SYSTEM_IBM_X40 + default n if ADK_TARGET_SYSTEM_ARANYM_M68K default y help Start getty on serial console. @@ -80,7 +82,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I - default "nfcon0" if ADK_TARGET_SYSTEM_ARANYM_M68K default "ttyS0" config ADK_RUNTIME_CONSOLE_SERIAL_SPEED |