Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[u-boot] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 623ec66a849e141f39d33fa0272f75acda2c73a9..4991da2226505dd73c18d9df472d3f786e442046 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -4,6 +4,10 @@ menu "MIPS architecture"
 config SYS_ARCH
        default "mips"
 
+config SYS_CPU
+       default "mips32" if CPU_MIPS32_R1 || CPU_MIPS32_R2
+       default "mips64" if CPU_MIPS64_R1 || CPU_MIPS64_R2
+
 config USE_PRIVATE_LIBGCC
        default y
 
@@ -16,6 +20,8 @@ config TARGET_QEMU_MIPS
        select SUPPORTS_LITTLE_ENDIAN
        select SUPPORTS_CPU_MIPS32_R1
        select SUPPORTS_CPU_MIPS32_R2
+       select SUPPORTS_CPU_MIPS64_R1
+       select SUPPORTS_CPU_MIPS64_R2
 
 config TARGET_MALTA
        bool "Support malta"
@@ -43,12 +49,6 @@ config TARGET_PB1X00
        select SUPPORTS_CPU_MIPS32_R1
        select SUPPORTS_CPU_MIPS32_R2
 
-config TARGET_QEMU_MIPS64
-       bool "Support qemu-mips64"
-       select SUPPORTS_BIG_ENDIAN
-       select SUPPORTS_LITTLE_ENDIAN
-       select SUPPORTS_CPU_MIPS64_R1
-       select SUPPORTS_CPU_MIPS64_R2
 
 endchoice