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

Commit cd741b60 authored by Shinya Kuribayashi's avatar Shinya Kuribayashi Committed by Ralf Baechle
Browse files

MIPS: EMMA: Kconfig reorganization 



- Move EMMA related stuff into arch/mips/emma/Kconfig
- Create CONFIG_SOC_EMMA* to handle more EMMA SoCs effectively
- Rename CONFIG_MARKEINS into CONFIG_NEC_MARKEINS

Signed-off-by: default avatarShinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 542c1020

arch/mips/Kconfig

+3 −14
Original line number Diff line number Diff line
@@ -238,20 +238,8 @@ config MIPS_SIM 
	  This option enables support for MIPS Technologies MIPSsim software

	  emulator.



config MARKEINS

	bool "NEC EMMA2RH Mark-eins"

	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_CPU_R5500

	help

	  This enables support for the NEC Mark-eins board with VR5500 CPU.

config MACH_EMMA

	bool "NEC EMMA series based machines"



config MACH_VR41XX

	bool "NEC VR4100 series based machines"
@@ -613,6 +601,7 @@ endchoice 


source "arch/mips/alchemy/Kconfig"

source "arch/mips/basler/excite/Kconfig"

source "arch/mips/emma/Kconfig"

source "arch/mips/jazz/Kconfig"

source "arch/mips/lasat/Kconfig"

source "arch/mips/pmc-sierra/Kconfig"

arch/mips/Makefile

+7 −4
Original line number Diff line number Diff line
@@ -409,14 +409,17 @@ load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000 
libs-$(CONFIG_PNX8550_STB810)	+= arch/mips/nxp/pnx8550/stb810/

load-$(CONFIG_PNX8550_STB810)	+= 0xffffffff80060000



#

# NEC EMMA2RH boards

#

core-$(CONFIG_EMMA2RH)          += arch/mips/emma2rh/common/

cflags-$(CONFIG_EMMA2RH)        += -I$(srctree)/arch/mips/include/asm/mach-emma2rh

core-$(CONFIG_SOC_EMMA2RH)	+= arch/mips/emma2rh/common/

cflags-$(CONFIG_SOC_EMMA2RH)	+= -I$(srctree)/arch/mips/include/asm/mach-emma2rh



#

# NEC EMMA2RH Mark-eins

core-$(CONFIG_MARKEINS)         += arch/mips/emma2rh/markeins/

load-$(CONFIG_MARKEINS)         += 0xffffffff88100000

#

core-$(CONFIG_NEC_MARKEINS)	+= arch/mips/emma2rh/markeins/

load-$(CONFIG_NEC_MARKEINS)	+= 0xffffffff88100000



#

# SGI IP22 (Indy/Indigo2)

arch/mips/emma/Kconfig

0 → 100644
+29 −0
Original line number Diff line number Diff line 
choice

	prompt "Machine type"

	depends on MACH_EMMA

	default NEC_MARKEINS



config NEC_MARKEINS

	bool "NEC EMMA2RH Mark-eins board"

	select SOC_EMMA2RH

	select HW_HAS_PCI

	help

	  This enables support for the NEC Electronics Mark-eins boards.



endchoice



config SOC_EMMA2RH

	bool

	select SOC_EMMA

	select SYS_HAS_CPU_R5500

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL



config SOC_EMMA

	bool

	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_BIG_ENDIAN

arch/mips/emma2rh/common/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ 
#  (at your option) any later version.

#



obj-$(CONFIG_MARKEINS)	+= irq.o irq_emma2rh.o prom.o
 
obj-$(CONFIG_NEC_MARKEINS)	+= irq.o irq_emma2rh.o prom.o

arch/mips/emma2rh/common/prom.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


const char *get_system_type(void)

{

#if defined(CONFIG_MARKEINS)

#ifdef CONFIG_NEC_MARKEINS

	return "NEC EMMA2RH Mark-eins";

#else

#error  Unknown NEC board
@@ -60,7 +60,7 @@ void __init prom_init(void) 
		strcat(arcs_cmdline, " ");

	}



#if defined(CONFIG_MARKEINS)

#ifdef CONFIG_NEC_MARKEINS

	add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);

#else

#error  Unknown NEC board