Commit 200d018e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [PATCH] add STB810 support (Philips PNX8550-based)
  [MIPS] Qemu now has an ELF loader.
  [MIPS] Add GENERIC_HARDIRQS_NO__DO_IRQ for i8259 users
  [MIPS] Optimize csum_partial for 64bit kernel
  [MIPS] Optimize flow of csum_partial
  [MIPS] Make csum_partial more readable
  [MIPS] Rename SNI_RM200_PCI to just SNI_RM preparing for more RM machines
parents eb991b39 f0647a52

arch/mips/Kconfig

+18 −7
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ config MIPS_COBALT 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select GENERIC_HARDIRQS_NO__DO_IRQ



config MACH_DECSTATION

	bool "DECstations"
@@ -225,6 +226,7 @@ config MACH_JAZZ 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_100HZ

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help

	 This a family of machines based on the MIPS R4030 chipset which was

	 used by several vendors to build RISC/os and Windows NT workstations.
@@ -459,6 +461,11 @@ config PNX8550_JBS 
	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_STB810

	bool "Support for Philips PNX8550 based STB810 board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config DDB5477

	bool "NEC DDB Vrc-5477"

	select DDB5XXX_COMMON
@@ -482,6 +489,7 @@ config MACH_VR41XX 
	select SYS_HAS_CPU_VR41XX

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select GENERIC_HARDIRQS_NO__DO_IRQ



config PMC_YOSEMITE

	bool "PMC-Sierra Yosemite eval board"
@@ -515,6 +523,7 @@ config QEMU 
	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select ARCH_SPARSEMEM_ENABLE

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help

	  Qemu is a software emulator which among other architectures also

	  can simulate a MIPS32 4Kc system.  This patch adds support for the
@@ -701,8 +710,8 @@ config SIBYTE_CRHONE 
	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN



config SNI_RM200_PCI

	bool "SNI RM200 PCI"

config SNI_RM

	bool "SNI RM200/300/400"

	select ARC if CPU_LITTLE_ENDIAN

	select ARC32 if CPU_LITTLE_ENDIAN

	select ARCH_MAY_HAVE_PC_FDC
@@ -725,8 +734,8 @@ config SNI_RM200_PCI 
	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help

	  The SNI RM200 PCI was a MIPS-based platform manufactured by Siemens

	  Nixdorf Informationssysteme (SNI), parent company of Pyramid

	  The SNI RM200/300/400 are MIPS-based machines manufactured by

	  Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid

	  Technology and now in turn merged with Fujitsu.  Say Y here to

	  support this machine type.
@@ -754,6 +763,7 @@ config TOSHIBA_RBTX4927 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select TOSHIBA_BOARDS

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help

	  This Toshiba board is based on the TX4927 processor. Say Y here to

	  support this machine type
@@ -773,6 +783,7 @@ config TOSHIBA_RBTX4938 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select TOSHIBA_BOARDS

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help

	  This Toshiba board is based on the TX4938 processor. Say Y here to

	  support this machine type
@@ -1070,16 +1081,16 @@ config HAVE_STD_PC_SERIAL_PORT 


config ARC_CONSOLE

	bool "ARC console support"

	depends on SGI_IP22 || SNI_RM200_PCI

	depends on SGI_IP22 || SNI_RM



config ARC_MEMORY

	bool

	depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP32

	depends on MACH_JAZZ || SNI_RM || SGI_IP32

	default y



config ARC_PROMLIB

	bool

	depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP22 || SGI_IP32

	depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP32

	default y



config ARC64

arch/mips/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -463,6 +463,11 @@ libs-$(CONFIG_PNX8550_JBS) += arch/mips/philips/pnx8550/jbs/ 
#cflags-$(CONFIG_PNX8550_JBS)	+= -Iinclude/asm-mips/mach-pnx8550

load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000



# Philips PNX8550 STB810 board

#

libs-$(CONFIG_PNX8550_STB810)	+= arch/mips/philips/pnx8550/stb810/

load-$(CONFIG_PNX8550_STB810)	+= 0xffffffff80060000



# NEC EMMA2RH boards

#

core-$(CONFIG_EMMA2RH)          += arch/mips/emma2rh/common/
@@ -569,11 +574,11 @@ libs-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ 
load-$(CONFIG_SIBYTE_BIGSUR)	:= 0xffffffff80100000



#

# SNI RM200 PCI

# SNI RM

#

core-$(CONFIG_SNI_RM200_PCI)	+= arch/mips/sni/

cflags-$(CONFIG_SNI_RM200_PCI)	+= -Iinclude/asm-mips/mach-rm200

load-$(CONFIG_SNI_RM200_PCI)	+= 0xffffffff80600000

core-$(CONFIG_SNI_RM)		+= arch/mips/sni/

cflags-$(CONFIG_SNI_RM)		+= -Iinclude/asm-mips/mach-rm

load-$(CONFIG_SNI_RM)		+= 0xffffffff80600000



#

# Toshiba JMR-TX3927 board
@@ -695,7 +700,7 @@ ifdef CONFIG_QEMU 
all:	vmlinux.bin

endif



ifdef CONFIG_SNI_RM200_PCI

ifdef CONFIG_SNI_RM

all:	vmlinux.ecoff

endif

arch/mips/configs/atlas_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ CONFIG_MIPS_ATLAS=y 
# CONFIG_SIBYTE_LITTLESUR is not set

# CONFIG_SIBYTE_CRHINE is not set

# CONFIG_SIBYTE_CRHONE is not set

# CONFIG_SNI_RM200_PCI is not set

# CONFIG_SNI_RM is not set

# CONFIG_TOSHIBA_JMR3927 is not set

# CONFIG_TOSHIBA_RBTX4927 is not set

# CONFIG_TOSHIBA_RBTX4938 is not set

arch/mips/configs/bigsur_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ CONFIG_SIBYTE_BIGSUR=y 
# CONFIG_SIBYTE_LITTLESUR is not set

# CONFIG_SIBYTE_CRHINE is not set

# CONFIG_SIBYTE_CRHONE is not set

# CONFIG_SNI_RM200_PCI is not set

# CONFIG_SNI_RM is not set

# CONFIG_TOSHIBA_JMR3927 is not set

# CONFIG_TOSHIBA_RBTX4927 is not set

# CONFIG_TOSHIBA_RBTX4938 is not set

arch/mips/configs/capcella_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ CONFIG_MACH_VR41XX=y 
# CONFIG_SIBYTE_LITTLESUR is not set

# CONFIG_SIBYTE_CRHINE is not set

# CONFIG_SIBYTE_CRHONE is not set

# CONFIG_SNI_RM200_PCI is not set

# CONFIG_SNI_RM is not set

# CONFIG_TOSHIBA_JMR3927 is not set

# CONFIG_TOSHIBA_RBTX4927 is not set

# CONFIG_TOSHIBA_RBTX4938 is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE