hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Shinya Kuribayashi 2008-10-24 06:00:01 +09:00 committed by Ralf Baechle
parent 542c1020ac
commit cd741b604b
8 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/mips/Kconfig
View File

@ -238,20 +238,8 @@ config MIPS_SIM
This option enables support for MIPS Technologies MIPSsim software This option enables support for MIPS Technologies MIPSsim software
emulator. emulator.
config MARKEINS config MACH_EMMA
bool "NEC EMMA2RH Mark-eins" bool "NEC EMMA series based machines"
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_VR41XX config MACH_VR41XX
bool "NEC VR4100 series based machines" bool "NEC VR4100 series based machines"
@ -613,6 +601,7 @@ endchoice
source "arch/mips/alchemy/Kconfig" source "arch/mips/alchemy/Kconfig"
source "arch/mips/basler/excite/Kconfig" source "arch/mips/basler/excite/Kconfig"
source "arch/mips/emma/Kconfig"
source "arch/mips/jazz/Kconfig" source "arch/mips/jazz/Kconfig"
source "arch/mips/lasat/Kconfig" source "arch/mips/lasat/Kconfig"
source "arch/mips/pmc-sierra/Kconfig" source "arch/mips/pmc-sierra/Kconfig"

11
arch/mips/Makefile
View File

@ -409,14 +409,17 @@ load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000
libs-$(CONFIG_PNX8550_STB810) += arch/mips/nxp/pnx8550/stb810/ libs-$(CONFIG_PNX8550_STB810) += arch/mips/nxp/pnx8550/stb810/
load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000
#
# NEC EMMA2RH boards # NEC EMMA2RH boards
# #
core-$(CONFIG_EMMA2RH) += arch/mips/emma2rh/common/ core-$(CONFIG_SOC_EMMA2RH) += arch/mips/emma2rh/common/
cflags-$(CONFIG_EMMA2RH) += -I$(srctree)/arch/mips/include/asm/mach-emma2rh cflags-$(CONFIG_SOC_EMMA2RH) += -I$(srctree)/arch/mips/include/asm/mach-emma2rh
#
# NEC EMMA2RH Mark-eins # 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) # SGI IP22 (Indy/Indigo2)

29
arch/mips/emma/Kconfig Normal file
View File

@ -0,0 +1,29 @@
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

2
arch/mips/emma2rh/common/Makefile
View File

@ -10,4 +10,4 @@
# (at your option) any later version. # (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

4
arch/mips/emma2rh/common/prom.c
View File

@ -33,7 +33,7 @@
const char *get_system_type(void) const char *get_system_type(void)
{ {
#if defined(CONFIG_MARKEINS) #ifdef CONFIG_NEC_MARKEINS
return "NEC EMMA2RH Mark-eins"; return "NEC EMMA2RH Mark-eins";
#else #else
#error Unknown NEC board #error Unknown NEC board
@ -60,7 +60,7 @@ void __init prom_init(void)
strcat(arcs_cmdline, " "); strcat(arcs_cmdline, " ");
} }
#if defined(CONFIG_MARKEINS) #ifdef CONFIG_NEC_MARKEINS
add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM); add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
#else #else
#error Unknown NEC board #error Unknown NEC board

2
arch/mips/emma2rh/markeins/Makefile
View File

@ -10,4 +10,4 @@
# (at your option) any later version. # (at your option) any later version.
# #
obj-$(CONFIG_MARKEINS) += irq.o irq_markeins.o setup.o led.o platform.o obj-$(CONFIG_NEC_MARKEINS) += irq.o irq_markeins.o setup.o led.o platform.o

2
arch/mips/include/asm/emma2rh/emma2rh.h
View File

@ -324,7 +324,7 @@ static inline u8 emma2rh_in8(u32 offset)
/* /*
* include the board dependent part * include the board dependent part
*/ */
#if defined(CONFIG_MARKEINS) #ifdef CONFIG_NEC_MARKEINS
#include <asm/emma2rh/markeins.h> #include <asm/emma2rh/markeins.h>
#else #else
#error "Unknown EMMA2RH board!" #error "Unknown EMMA2RH board!"

2
arch/mips/pci/Makefile
View File

@ -13,7 +13,7 @@ obj-$(CONFIG_MIPS_MSC) += ops-msc.o
obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o
obj-$(CONFIG_SOC_TX3927) += ops-tx3927.o obj-$(CONFIG_SOC_TX3927) += ops-tx3927.o
obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o
obj-$(CONFIG_MARKEINS) += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o obj-$(CONFIG_NEC_MARKEINS) += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o
obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o