diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/config/Config.in.x86.choice | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/config/Config.in.x86.choice')
| -rw-r--r-- | target/config/Config.in.x86.choice | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/target/config/Config.in.x86.choice b/target/config/Config.in.x86.choice new file mode 100644 index 000000000..5523902e0 --- /dev/null +++ b/target/config/Config.in.x86.choice @@ -0,0 +1,24 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +choice ADK_TARGET_X86_CPU_MODEL +prompt "CPU model" +depends on ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC + +config ADK_CPU_I486 + boolean "i486" + select ADK_i486 + +config ADK_CPU_I586 + boolean "i586" + select ADK_i586 + +config ADK_CPU_I686 + boolean "i686" + select ADK_i686 + +config ADK_CPU_ATOM + boolean "atom" + select ADK_atom + +endchoice |