From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- target/config/Config.in.x86.default | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 target/config/Config.in.x86.default (limited to 'target/config/Config.in.x86.default') 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 + -- cgit v1.2.3