diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-02 19:50:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-02 19:50:47 +0200 |
| commit | 6f96b57ffa30d8e1bf6af9d1e9fae1902cb419e1 (patch) | |
| tree | 4ae705ebc844f4fc08e34e92af689cdb76475423 /target/config/Config.in | |
| parent | b7bbd7b3cf2d9f774464953fd2c42be9cabe790c (diff) | |
| parent | 64d1148c48e3cd428da42a5eb9bcda50f08171fb (diff) | |
resolve conflict
Diffstat (limited to 'target/config/Config.in')
| -rw-r--r-- | target/config/Config.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 89d207e61..7be4cf844 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -348,10 +348,11 @@ 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=tty0" if ADK_TARGET_SYSTEM_QEMU_SH # sh serial is broken + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_ARM default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_FOXBOARD_LX + default "console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH default "" # c library @@ -462,6 +463,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS ADK_LINUX_X86_64 || \ ADK_LINUX_NATIVE select ADK_KERNEL_BLK_DEV_INITRD + select ADK_KERNEL_RD_XZ help create an read-only initramfs system. |