Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14b36af4 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Ralf Baechle
Browse files

[MIPS] Rename SNI_RM200_PCI to just SNI_RM preparing for more RM machines 



Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 88032b32

arch/mips/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -701,8 +701,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 +725,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.
@@ -1070,16 +1070,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

+5 −5
Original line number Diff line number Diff line
@@ -569,11 +569,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 +695,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