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/mips/sys-available/toolchain-mips | |
parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) |
resolve merge conflict
Diffstat (limited to 'target/mips/sys-available/toolchain-mips')
-rw-r--r-- | target/mips/sys-available/toolchain-mips | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips index 7c7e1c142..035908220 100644 --- a/target/mips/sys-available/toolchain-mips +++ b/target/mips/sys-available/toolchain-mips @@ -1,10 +1,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS - bool "Toolchain only (mips32 big endian)" + bool "Toolchain only" select ADK_mips - select ADK_big select ADK_toolchain_mips - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help - MIPS32 big endian toolchain. + MIPS toolchain. |