diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
commit | 4a54d9dd804bc3b64703ba04060ec8c48a8c9811 (patch) | |
tree | 948f1b2bead3d128603ad5a34609205db61da3aa /target/x86/sys-available/qemu-i686 | |
parent | e61aad237ecb819635bb7550dbbf66f2b8817b50 (diff) | |
parent | 40c2b2f6a83e9cca14567e855fc75a8d1ef78f28 (diff) |
resolve conflict
Diffstat (limited to 'target/x86/sys-available/qemu-i686')
-rw-r--r-- | target/x86/sys-available/qemu-i686 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686 new file mode 100644 index 000000000..d77d074e3 --- /dev/null +++ b/target/x86/sys-available/qemu-i686 @@ -0,0 +1,13 @@ +config ADK_TARGET_SYSTEM_QEMU_I686 + bool "Qemu Emulator" + select ADK_x86 + select ADK_qemu_i686 + 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 (i686). + |