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

Commit 326d8519 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:
  MIPS: Mark Eins: Fix configuration.
  MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled
parents 228b5b7e a83860c2

arch/mips/Kconfig

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

	  emulator.



config MACH_EMMA

	bool "NEC EMMA series based machines"

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.



config MACH_VR41XX

	bool "NEC VR4100 series based machines"
@@ -637,7 +641,6 @@ 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"
@@ -895,6 +898,18 @@ config MIPS_RM9122 
	bool

	select SERIAL_RM9000



config SOC_EMMA2RH

	bool

	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_R5500

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN



config SOC_PNX833X

	bool

	select CEVT_R4K
@@ -930,11 +945,6 @@ config SOC_PNX8550 
config SWAP_IO_SPACE

	bool



config EMMA2RH

	bool

	depends on MARKEINS

	default y



config SERIAL_RM9000

	bool

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 
#

# Common NEC EMMAXXX

#

core-$(CONFIG_SOC_EMMA)		+= arch/mips/emma/common/

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

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



#

arch/mips/configs/emma2rh_defconfig→arch/mips/configs/markeins_defconfig

+5 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ CONFIG_ZONE_DMA=y 
# CONFIG_PNX8550_STB810 is not set

# CONFIG_MACH_VR41XX is not set

# CONFIG_PMC_YOSEMITE is not set

CONFIG_MARKEINS=y

CONFIG_NEC_MARKEINS=y

# CONFIG_SGI_IP22 is not set

# CONFIG_SGI_IP27 is not set

# CONFIG_SGI_IP32 is not set
@@ -68,7 +68,7 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y

CONFIG_IRQ_CPU=y

CONFIG_SWAP_IO_SPACE=y

CONFIG_EMMA2RH=y

CONFIG_SOC_EMMA2RH=y

CONFIG_MIPS_L1_CACHE_SHIFT=5



#
@@ -574,9 +574,9 @@ CONFIG_MTD_CFI_UTIL=y 
#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_START=0x1e000000

CONFIG_MTD_PHYSMAP_LEN=0x02000000

CONFIG_MTD_PHYSMAP_BANKWIDTH=2

CONFIG_MTD_PHYSMAP_START=0x0

CONFIG_MTD_PHYSMAP_LEN=0x0

CONFIG_MTD_PHYSMAP_BANKWIDTH=0

# CONFIG_MTD_PLATRAM is not set



#

arch/mips/emma/Kconfig

deleted100644 → 0
+0 −29
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/emma/markeins/platform.c

+30 −9
Original line number Diff line number Diff line
@@ -141,13 +141,6 @@ static struct platform_device serial_emma = { 
	},

};



static struct platform_device *devices[] = {

	&i2c_emma_devices[0],

	&i2c_emma_devices[1],

	&i2c_emma_devices[2],

	&serial_emma,

};



static struct mtd_partition markeins_parts[] = {

	[0] = {

		.name = "RootFS",
@@ -181,11 +174,39 @@ static struct mtd_partition markeins_parts[] = { 
	},

};



static struct physmap_flash_data markeins_flash_data = {

	.width		= 2,

	.nr_parts	= ARRAY_SIZE(markeins_parts),

	.parts		= markeins_parts

};



static struct resource markeins_flash_resource = {

	.start		= 0x1e000000,

	.end		= 0x02000000,

	.flags		= IORESOURCE_MEM

};



static struct platform_device markeins_flash_device = {

	.name		= "physmap-flash",

	.id		= 0,

	.dev		= {

        	.platform_data  = &markeins_flash_data,

	},

	.num_resources	= 1,

	.resource	= &markeins_flash_resource,

};



static struct platform_device *devices[] = {

	i2c_emma_devices,

	i2c_emma_devices + 1,

	i2c_emma_devices + 2,

	&serial_emma,

	&markeins_flash_device,

};



static int __init platform_devices_setup(void)

{

	physmap_set_partitions(markeins_parts, ARRAY_SIZE(markeins_parts));

	return platform_add_devices(devices, ARRAY_SIZE(devices));

}



arch_initcall(platform_devices_setup);