From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 28 Sep 2012 14:29:55 +0000 (+0200)
Subject: Merge branch 'ralf-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cb418b34caddc970c1513e515aaa535246a4bba3;p=deliverable%2Flinux.git

Merge branch 'ralf-3.7' of git://git.linux-mips.org/sjhill/linux-sjhill into mips-for-linux-next
---

cb418b34caddc970c1513e515aaa535246a4bba3
diff --cc arch/mips/Kbuild.platforms
index 0759dd2524bf,98d1e3cc70c7..91b9d69f465c
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@@ -15,7 -15,9 +15,8 @@@ platforms += lanti
  platforms += lasat
  platforms += loongson
  platforms += loongson1
 -platforms += mipssim
  platforms += mti-malta
+ platforms += mti-sead3
  platforms += netlogic
  platforms += pmc-sierra
  platforms += pnx833x
diff --cc arch/mips/Kconfig
index c0cbde6c1770,e15180ba9f63..566462c358c5
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -322,6 -319,55 +322,36 @@@ config MIPS_MALT
  	  This enables support for the MIPS Technologies Malta evaluation
  	  board.
  
+ config MIPS_SEAD3
+ 	bool "MIPS SEAD3 board"
+ 	select BOOT_ELF32
+ 	select BOOT_RAW
+ 	select CEVT_R4K
+ 	select CSRC_R4K
+ 	select CPU_MIPSR2_IRQ_VI
+ 	select CPU_MIPSR2_IRQ_EI
+ 	select DMA_NONCOHERENT
+ 	select IRQ_CPU
+ 	select IRQ_GIC
+ 	select MIPS_BOARDS_GEN
+ 	select MIPS_CPU_SCACHE
+ 	select MIPS_MSC
+ 	select SYS_HAS_CPU_MIPS32_R1
+ 	select SYS_HAS_CPU_MIPS32_R2
+ 	select SYS_HAS_CPU_MIPS64_R1
+ 	select SYS_HAS_EARLY_PRINTK
+ 	select SYS_SUPPORTS_32BIT_KERNEL
+ 	select SYS_SUPPORTS_64BIT_KERNEL
+ 	select SYS_SUPPORTS_BIG_ENDIAN
+ 	select SYS_SUPPORTS_LITTLE_ENDIAN
+ 	select SYS_SUPPORTS_SMARTMIPS
+ 	select USB_ARCH_HAS_EHCI
+ 	select USB_EHCI_BIG_ENDIAN_DESC
+ 	select USB_EHCI_BIG_ENDIAN_MMIO
+ 	help
+ 	  This enables support for the MIPS Technologies SEAD3 evaluation
+ 	  board.
+ 
 -config MIPS_SIM
 -	bool 'MIPS simulator (MIPSsim)'
 -	select CEVT_R4K
 -	select CSRC_R4K
 -	select DMA_NONCOHERENT
 -	select SYS_HAS_EARLY_PRINTK
 -	select IRQ_CPU
 -	select BOOT_RAW
 -	select SYS_HAS_CPU_MIPS32_R1
 -	select SYS_HAS_CPU_MIPS32_R2
 -	select SYS_HAS_EARLY_PRINTK
 -	select SYS_SUPPORTS_32BIT_KERNEL
 -	select SYS_SUPPORTS_BIG_ENDIAN
 -	select SYS_SUPPORTS_MULTITHREADING
 -	select SYS_SUPPORTS_LITTLE_ENDIAN
 -	help
 -	  This option enables support for MIPS Technologies MIPSsim software
 -	  emulator.
 -
  config NEC_MARKEINS
  	bool "NEC EMMA2RH Mark-eins board"
  	select SOC_EMMA2RH