diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/x86/sys-available/qemu-x86 | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86/sys-available/qemu-x86')
| -rw-r--r-- | target/x86/sys-available/qemu-x86 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/target/x86/sys-available/qemu-x86 b/target/x86/sys-available/qemu-x86 new file mode 100644 index 000000000..378d9fb8e --- /dev/null +++ b/target/x86/sys-available/qemu-x86 @@ -0,0 +1,13 @@ +config ADK_TARGET_SYSTEM_QEMU_X86 + bool "Qemu Emulator" + select ADK_x86 + select ADK_qemu_x86 + select ADK_CPU_I686 + select ADK_HARDWARE_QEMU + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_HDD + help + Support for Qemu Emulator. + |