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.arch.default | |
parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) |
resolve merge conflict
Diffstat (limited to 'target/config/Config.in.arch.default')
-rw-r--r-- | target/config/Config.in.arch.default | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default index df7e422f3..2b8abc7a1 100644 --- a/target/config/Config.in.arch.default +++ b/target/config/Config.in.arch.default @@ -1,3 +1,6 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + # target architectures config ADK_aarch64 bool @@ -14,6 +17,9 @@ config ADK_microblaze config ADK_mips bool +config ADK_mips64 + bool + config ADK_ppc bool @@ -42,6 +48,7 @@ config ADK_TARGET_ARCH default "m68k" if ADK_m68k default "microblaze" if ADK_microblaze default "mips" if ADK_mips + default "mips64" if ADK_mips64 default "ppc" if ADK_ppc default "ppc64" if ADK_ppc64 default "sparc" if ADK_sparc |