diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
| commit | 4f64f833872a6c83dd95149a553b9ed5258b4efe (patch) | |
| tree | 1d653351e49b62def18e74af5b18d6cb2a848a79 /target/config | |
| parent | ee418b2a37c2e45bd35625157dbc1b59fcacf8c7 (diff) | |
| parent | c20e67a4a06a377a277544a498338fa6a09e9e3f (diff) | |
resolve conflict
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index d5cdcdb70..5c38228b6 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -227,6 +227,9 @@ config ADK_CPU_I586 config ADK_CPU_I686 boolean +config ADK_CPU_X86_64 + boolean + config ADK_CPU_GEODE boolean @@ -248,6 +251,7 @@ config ADK_CPU_ARMV5 config ADK_TARGET_CPU_ARCH string + default "x86_64" if ADK_CPU_X86_64 default "i486" if ADK_CPU_I486 default "i586" if ADK_CPU_I586 default "i686" if ADK_CPU_I686 |