Commit 661af35e authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Merge branch 'mipsr6-for-3.20' of... 

Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next
parents ca5d2564 f296e7c4

arch/mips/Kconfig

+68 −4
Original line number Diff line number Diff line
@@ -377,8 +377,10 @@ config MIPS_MALTA 
	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_CPU_MIPS32_R3_5

	select SYS_HAS_CPU_MIPS32_R6

	select SYS_HAS_CPU_MIPS64_R1

	select SYS_HAS_CPU_MIPS64_R2

	select SYS_HAS_CPU_MIPS64_R6

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_CPU_RM7000

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -1034,6 +1036,9 @@ config MIPS_MACHINE 
config NO_IOPORT_MAP

	def_bool n



config GENERIC_CSUM

	bool



config GENERIC_ISA_DMA

	bool

	select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
@@ -1147,6 +1152,9 @@ config SOC_PNX8335 
	bool

	select SOC_PNX833X



config MIPS_SPRAM

	bool



config SWAP_IO_SPACE

	bool
@@ -1305,6 +1313,22 @@ config CPU_MIPS32_R2 
	  specific type of processor in your system, choose those that one

	  otherwise CPU_MIPS32_R1 is a safe bet for any MIPS32 system.



config CPU_MIPS32_R6

	bool "MIPS32 Release 6 (EXPERIMENTAL)"

	depends on SYS_HAS_CPU_MIPS32_R6

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_MSA

	select GENERIC_CSUM

	select HAVE_KVM

	select MIPS_O32_FP64_SUPPORT

	help

	  Choose this option to build a kernel for release 6 or later of the

	  MIPS32 architecture.  New MIPS processors, starting with the Warrior

	  family, are based on a MIPS32r6 processor. If you own an older

	  processor, you probably need to select MIPS32r1 or MIPS32r2 instead.



config CPU_MIPS64_R1

	bool "MIPS64 Release 1"

	depends on SYS_HAS_CPU_MIPS64_R1
@@ -1340,6 +1364,21 @@ config CPU_MIPS64_R2 
	  specific type of processor in your system, choose those that one

	  otherwise CPU_MIPS64_R1 is a safe bet for any MIPS64 system.



config CPU_MIPS64_R6

	bool "MIPS64 Release 6 (EXPERIMENTAL)"

	depends on SYS_HAS_CPU_MIPS64_R6

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_MSA

	select GENERIC_CSUM

	help

	  Choose this option to build a kernel for release 6 or later of the

	  MIPS64 architecture.  New MIPS processors, starting with the Warrior

	  family, are based on a MIPS64r6 processor. If you own an older

	  processor, you probably need to select MIPS64r1 or MIPS64r2 instead.



config CPU_R3000

	bool "R3000"

	depends on SYS_HAS_CPU_R3000
@@ -1540,7 +1579,7 @@ endchoice 
config CPU_MIPS32_3_5_FEATURES

	bool "MIPS32 Release 3.5 Features"

	depends on SYS_HAS_CPU_MIPS32_R3_5

	depends on CPU_MIPS32_R2

	depends on CPU_MIPS32_R2 || CPU_MIPS32_R6

	help

	  Choose this option to build a kernel for release 2 or later of the

	  MIPS32 architecture including features from the 3.5 release such as
@@ -1660,12 +1699,18 @@ config SYS_HAS_CPU_MIPS32_R2 
config SYS_HAS_CPU_MIPS32_R3_5

	bool



config SYS_HAS_CPU_MIPS32_R6

	bool



config SYS_HAS_CPU_MIPS64_R1

	bool



config SYS_HAS_CPU_MIPS64_R2

	bool



config SYS_HAS_CPU_MIPS64_R6

	bool



config SYS_HAS_CPU_R3000

	bool
@@ -1765,11 +1810,11 @@ endmenu 
#

config CPU_MIPS32

	bool

	default y if CPU_MIPS32_R1 || CPU_MIPS32_R2

	default y if CPU_MIPS32_R1 || CPU_MIPS32_R2 || CPU_MIPS32_R6



config CPU_MIPS64

	bool

	default y if CPU_MIPS64_R1 || CPU_MIPS64_R2

	default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R6



#

# These two indicate the revision of the architecture, either Release 1 or Release 2
@@ -1781,6 +1826,12 @@ config CPU_MIPSR1 
config CPU_MIPSR2

	bool

	default y if CPU_MIPS32_R2 || CPU_MIPS64_R2 || CPU_CAVIUM_OCTEON

	select MIPS_SPRAM



config CPU_MIPSR6

	bool

	default y if CPU_MIPS32_R6 || CPU_MIPS64_R6

	select MIPS_SPRAM



config EVA

	bool
@@ -2014,6 +2065,19 @@ config MIPS_MT_FPAFF 
	default y

	depends on MIPS_MT_SMP



config MIPSR2_TO_R6_EMULATOR

	bool "MIPS R2-to-R6 emulator"

	depends on CPU_MIPSR6 && !SMP

	default y

	help

	  Choose this option if you want to run non-R6 MIPS userland code.

	  Even if you say 'Y' here, the emulator will still be disabled by

	  default. You can enable it using the 'mipsr2emul' kernel option.

	  The only reason this is a build-time option is to save ~14K from the

	  final kernel image.

comment "MIPS R2-to-R6 emulator is only available for UP kernels"

	depends on SMP && CPU_MIPSR6



config MIPS_VPE_LOADER

	bool "VPE loader support."

	depends on SYS_SUPPORTS_MULTITHREADING && MODULES
@@ -2149,7 +2213,7 @@ config CPU_HAS_SMARTMIPS 
	  here.



config CPU_MICROMIPS

	depends on 32BIT && SYS_SUPPORTS_MICROMIPS

	depends on 32BIT && SYS_SUPPORTS_MICROMIPS && !CPU_MIPSR6

	bool "microMIPS"

	help

	  When this option is enabled the kernel will be built using the

arch/mips/Kconfig.debug

+0 −13
Original line number Diff line number Diff line
@@ -122,17 +122,4 @@ config SPINLOCK_TEST 
	help

	  Add several files to the debugfs to test spinlock speed.



config FP32XX_HYBRID_FPRS

	bool "Run FP32 & FPXX code with hybrid FPRs"

	depends on MIPS_O32_FP64_SUPPORT

	help

	  The hybrid FPR scheme is normally used only when a program needs to

	  execute a mix of FP32 & FP64A code, since the trapping & emulation

	  that it entails is expensive. When enabled, this option will lead

	  to the kernel running programs which use the FP32 & FPXX FP ABIs

	  using the hybrid FPR scheme, which can be useful for debugging

	  purposes.



	  If unsure, say N.



endmenu

arch/mips/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -138,10 +138,12 @@ cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS 
			-Wa,-mips32 -Wa,--trap

cflags-$(CONFIG_CPU_MIPS32_R2)	+= $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \

			-Wa,-mips32r2 -Wa,--trap

cflags-$(CONFIG_CPU_MIPS32_R6)	+= -march=mips32r6 -Wa,--trap

cflags-$(CONFIG_CPU_MIPS64_R1)	+= $(call cc-option,-march=mips64,-mips64 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) \

			-Wa,-mips64 -Wa,--trap

cflags-$(CONFIG_CPU_MIPS64_R2)	+= $(call cc-option,-march=mips64r2,-mips64r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) \

			-Wa,-mips64r2 -Wa,--trap

cflags-$(CONFIG_CPU_MIPS64_R6)	+= -march=mips64r6 -Wa,--trap

cflags-$(CONFIG_CPU_R5000)	+= -march=r5000 -Wa,--trap

cflags-$(CONFIG_CPU_R5432)	+= $(call cc-option,-march=r5400,-march=r5000) \

			-Wa,--trap

arch/mips/configs/malta_qemu_32r6_defconfig

0 → 100644
+193 −0
Original line number Diff line number Diff line 
CONFIG_MIPS_MALTA=y

CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_CPU_MIPS32_R6=y

CONFIG_PAGE_SIZE_16KB=y

CONFIG_HZ_100=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=15

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PCI=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_NET_IPIP=m

CONFIG_IP_MROUTE=y

CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_SYN_COOKIES=y

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

# CONFIG_INET_LRO is not set

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_TUNNEL=m

CONFIG_BRIDGE=m

CONFIG_VLAN_8021Q=m

CONFIG_ATALK=m

CONFIG_DEV_APPLETALK=m

CONFIG_IPDDP=m

CONFIG_IPDDP_ENCAP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m

CONFIG_NET_SCH_HFSC=m

CONFIG_NET_SCH_PRIO=m

CONFIG_NET_SCH_RED=m

CONFIG_NET_SCH_SFQ=m

CONFIG_NET_SCH_TEQL=m

CONFIG_NET_SCH_TBF=m

CONFIG_NET_SCH_GRED=m

CONFIG_NET_SCH_DSMARK=m

CONFIG_NET_SCH_NETEM=m

CONFIG_NET_SCH_INGRESS=m

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_ACT=y

CONFIG_NET_ACT_POLICE=y

CONFIG_NET_CLS_IND=y

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_IDE=y

# CONFIG_IDE_PROC_FS is not set

# CONFIG_IDEPCI_PCIBUS_ORDER is not set

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_PIIX=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_ADAPTEC is not set

# CONFIG_NET_VENDOR_ALTEON is not set

CONFIG_PCNET32=y

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_EXAR is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MELLANOX is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MYRI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_PACKET_ENGINE is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

# CONFIG_NET_VENDOR_REALTEK is not set

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SILAN is not set

# CONFIG_NET_VENDOR_SIS is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SUN is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

# CONFIG_NET_VENDOR_TOSHIBA is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

# CONFIG_VT is not set

CONFIG_LEGACY_PTY_COUNT=4

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_HW_RANDOM=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_MATROX=y

CONFIG_FB_MATROX_G=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_UHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_IDE_DISK=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_CMOS=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_XFS_FS=y

CONFIG_XFS_QUOTA=y

CONFIG_XFS_POSIX_ACL=y

CONFIG_QUOTA=y

CONFIG_QFMT_V2=y

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_CIFS=m

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ISO8859_1=m

# CONFIG_FTRACE is not set

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

arch/mips/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# MIPS headers

generic-(CONFIG_GENERIC_CSUM) += checksum.h

generic-y += cputime.h

generic-y += current.h

generic-y += dma-contiguous.h