summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-30 23:25:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-30 23:25:19 +0000
commitc378352de8a07a7b8dabd444d130710ce1cb3eed (patch)
tree6d8ed11b7a963d8ceb090fe37c2b07d8b4f96722 /target
parente4d54f317df641faf216e4000fbc3d091d3c1abc (diff)
parentd23798bfdc9bb34909177c3c5f06f0c97cc9897e (diff)
downloadbuild-c378352de8a07a7b8dabd444d130710ce1cb3eed.zip
build-c378352de8a07a7b8dabd444d130710ce1cb3eed.tar.gz
build-c378352de8a07a7b8dabd444d130710ce1cb3eed.tar.bz2
am d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit 'd23798bfdc9bb34909177c3c5f06f0c97cc9897e': [MIPSR6] Add mips64r6 and mips32r6 targets
Diffstat (limited to 'target')
-rw-r--r--target/board/generic_mips64/BoardConfig.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk
index 88a24a3..5dc943a 100644
--- a/target/board/generic_mips64/BoardConfig.mk
+++ b/target/board/generic_mips64/BoardConfig.mk
@@ -30,8 +30,12 @@ TARGET_CPU_ABI := mips64
TARGET_2ND_ARCH := mips
ifeq (,$(TARGET_2ND_ARCH_VARIANT))
+ifeq ($(TARGET_ARCH_VARIANT),mips64r6)
+TARGET_2ND_ARCH_VARIANT := mips32r6
+else
TARGET_2ND_ARCH_VARIANT := mips32r2-fp
endif
+endif
TARGET_2ND_CPU_ABI := mips
# The emulator (qemu) uses the Goldfish devices