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

Commit 0e2794b0 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Kconfig: Rename several firmware related config symbols. 



With the upcoming merge of the ARC architecture there is a small likelyhood
of conflicting use for the CONFIG_ARC config symbol.  Rename it to
CONFIG_FW_ARC.  Also rename CONFIG_ARC32 to CONFIG_FW_ARC32, CONFIG_ARC64
to CONFIG_FW_ARC64.

For consistence also rename CONFIG_SNIPROM to CONFIG_FW_SNIPROM and
CONFIG_CFE to CONFIG_FW_CFE.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent abe77f90

arch/mips/Kconfig

+17 −17
Original line number Diff line number Diff line
@@ -109,13 +109,13 @@ config BCM47XX 
	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select FW_CFE

	select HW_HAS_PCI

	select IRQ_CPU

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select GENERIC_GPIO

	select SYS_HAS_EARLY_PRINTK

	select CFE

	help

	 Support for BCM47XX based boards
@@ -192,8 +192,8 @@ config MACH_DECSTATION 


config MACH_JAZZ

	bool "Jazz family of machines"

	select ARC

	select ARC32

	select FW_ARC

	select FW_ARC32

	select ARCH_MAY_HAVE_PC_FDC

	select CEVT_R4K

	select CSRC_R4K
@@ -457,8 +457,8 @@ config POWERTV 


config SGI_IP22

	bool "SGI IP22 (Indy/Indigo2)"

	select ARC

	select ARC32

	select FW_ARC

	select FW_ARC32

	select BOOT_ELF32

	select CEVT_R4K

	select CSRC_R4K
@@ -497,8 +497,8 @@ config SGI_IP22 


config SGI_IP27

	bool "SGI IP27 (Origin200/2000)"

	select ARC

	select ARC64

	select FW_ARC

	select FW_ARC64

	select BOOT_ELF64

	select DEFAULT_SGI_PARTITION

	select DMA_COHERENT
@@ -518,8 +518,8 @@ config SGI_IP27 
config SGI_IP28

	bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	select ARC

	select ARC64

	select FW_ARC

	select FW_ARC64

	select BOOT_ELF64

	select CEVT_R4K

	select CSRC_R4K
@@ -554,8 +554,8 @@ config SGI_IP28 


config SGI_IP32

	bool "SGI IP32 (O2)"

	select ARC

	select ARC32

	select FW_ARC

	select FW_ARC32

	select BOOT_ELF32

	select CEVT_R4K

	select CSRC_R4K
@@ -673,8 +673,8 @@ config SIBYTE_BIGSUR 


config SNI_RM

	bool "SNI RM200/300/400"

	select ARC if CPU_LITTLE_ENDIAN

	select ARC32 if CPU_LITTLE_ENDIAN

	select FW_ARC if CPU_LITTLE_ENDIAN

	select FW_ARC32 if CPU_LITTLE_ENDIAN

	select SNIPROM if CPU_BIG_ENDIAN

	select ARCH_MAY_HAVE_PC_FDC

	select BOOT_ELF32
@@ -908,7 +908,7 @@ config SCHED_OMIT_FRAME_POINTER 
#

# Select some configuration options automatically based on user selections.

#

config ARC

config FW_ARC

	bool



config ARCH_MAY_HAVE_PC_FDC
@@ -963,7 +963,7 @@ config GPIO_TXX9 
	select ARCH_REQUIRE_GPIOLIB

	bool



config CFE

config FW_CFE

	bool



config ARCH_DMA_ADDR_T_64BIT
@@ -1188,7 +1188,7 @@ config SGI_HAS_I8042 
config DEFAULT_SGI_PARTITION

	bool



config ARC32

config FW_ARC32

	bool



config SNIPROM
@@ -1221,7 +1221,7 @@ config ARC_PROMLIB 
	depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP28 || SGI_IP32

	default y



config ARC64

config FW_ARC64

	bool



config BOOT_ELF64

arch/mips/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ endif 
#

# Firmware support

#

libs-$(CONFIG_ARC)		+= arch/mips/fw/arc/

libs-$(CONFIG_CFE)		+= arch/mips/fw/cfe/

libs-$(CONFIG_SNIPROM)		+= arch/mips/fw/sni/

libs-$(CONFIG_FW_ARC)		+= arch/mips/fw/arc/

libs-$(CONFIG_FW_CFE)		+= arch/mips/fw/cfe/

libs-$(CONFIG_FW_SNIPROM)	+= arch/mips/fw/sni/

libs-y				+= arch/mips/fw/lib/



#

arch/mips/fw/sni/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
# Makefile for the SNI prom monitor routines under Linux.

#



lib-$(CONFIG_SNIPROM)	+= sniprom.o
 
lib-$(CONFIG_FW_SNIPROM)	+= sniprom.o

arch/mips/include/asm/fw/arc/types.h

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#define _ASM_ARC_TYPES_H





#ifdef CONFIG_ARC32

#ifdef CONFIG_FW_ARC32



typedef char		CHAR;

typedef short		SHORT;
@@ -33,9 +33,9 @@ typedef LONG _PUSHORT; 
typedef LONG		_PULONG;

typedef LONG		_PVOID;



#endif /* CONFIG_ARC32 */

#endif /* CONFIG_FW_ARC32 */



#ifdef CONFIG_ARC64

#ifdef CONFIG_FW_ARC64



typedef char		CHAR;

typedef short		SHORT;
@@ -57,7 +57,7 @@ typedef USHORT *_PUSHORT; 
typedef ULONG		*_PULONG;

typedef VOID		*_PVOID;



#endif /* CONFIG_ARC64  */

#endif /* CONFIG_FW_ARC64  */



typedef CHAR		*PCHAR;

typedef SHORT		*PSHORT;

arch/mips/include/asm/sgiarcs.h

+4 −4
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ struct linux_smonblock { 
 * Macros for calling a 32-bit ARC implementation from 64-bit code

 */



#if defined(CONFIG_64BIT) && defined(CONFIG_ARC32)

#if defined(CONFIG_64BIT) && defined(CONFIG_FW_ARC32)



#define __arc_clobbers							\

	"$2", "$3" /* ... */, "$8", "$9", "$10", "$11", 			\
@@ -475,10 +475,10 @@ struct linux_smonblock { 
	__res;								\

})



#endif /* defined(CONFIG_64BIT) && defined(CONFIG_ARC32) */

#endif /* defined(CONFIG_64BIT) && defined(CONFIG_FW_ARC32) */



#if (defined(CONFIG_32BIT) && defined(CONFIG_ARC32)) ||		\

    (defined(CONFIG_64BIT) && defined(CONFIG_ARC64))

#if (defined(CONFIG_32BIT) && defined(CONFIG_FW_ARC32)) ||		\

    (defined(CONFIG_64BIT) && defined(CONFIG_FW_ARC64))



#define ARC_CALL0(dest)							\

({	long __res;							\