summaryrefslogtreecommitdiffstats
path: root/target/board/generic_mips64
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-30 23:30:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-30 23:30:07 +0000
commit1a6971b2f555525b684c804d5326e0e6a4f3effc (patch)
tree9d038aae86682095c419ee0e291c92dcaca00606 /target/board/generic_mips64
parent81379e6590689b0852da40f6477d8d32525d934b (diff)
parentc378352de8a07a7b8dabd444d130710ce1cb3eed (diff)
downloadbuild-1a6971b2f555525b684c804d5326e0e6a4f3effc.zip
build-1a6971b2f555525b684c804d5326e0e6a4f3effc.tar.gz
build-1a6971b2f555525b684c804d5326e0e6a4f3effc.tar.bz2
am c378352d: am d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit 'c378352de8a07a7b8dabd444d130710ce1cb3eed': [MIPSR6] Add mips64r6 and mips32r6 targets
Diffstat (limited to 'target/board/generic_mips64')
-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