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.choice | |
parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) |
resolve merge conflict
Diffstat (limited to 'target/config/Config.in.arch.choice')
-rw-r--r-- | target/config/Config.in.arch.choice | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice index 54141eb3a..517d6a00f 100644 --- a/target/config/Config.in.arch.choice +++ b/target/config/Config.in.arch.choice @@ -34,29 +34,35 @@ config ADK_LINUX_MIPS help Support for MIPS systems. +config ADK_LINUX_MIPS64 + bool "mips64 system" + select ADK_mips64 + help + Support for MIPS64 systems. + config ADK_LINUX_PPC bool "ppc system" select ADK_ppc help - Support for powerpc systems. + Support for PPC systems. config ADK_LINUX_PPC64 bool "ppc64 system" select ADK_ppc64 help - Support for powerpc64 systems. + Support for PPC64 systems. config ADK_LINUX_SPARC bool "sparc system" select ADK_sparc help - Support for sparc systems. + Support for SPARC systems. config ADK_LINUX_SPARC64 bool "sparc64 system" select ADK_sparc64 help - Support for sparc64 systems. + Support for SPARC64 systems. config ADK_LINUX_SH bool "superh system" |