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.default | |
parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) |
resolve merge conflict
Diffstat (limited to 'target/config/Config.in.x86.default')
-rw-r--r-- | target/config/Config.in.x86.default | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/target/config/Config.in.x86.default b/target/config/Config.in.x86.default new file mode 100644 index 000000000..6001b030f --- /dev/null +++ b/target/config/Config.in.x86.default @@ -0,0 +1,22 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_i486 + boolean + +config ADK_i586 + boolean + +config ADK_i686 + boolean + +config ADK_atom + boolean + +config ADK_TARGET_X86_CPU + string + default "i486" if ADK_i486 + default "i586" if ADK_i586 + default "i686" if ADK_i686 + default "atom" if ADK_atom + |