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

Commit de361e8b authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: JZ4740: introduce CONFIG_MACH_INGENIC 



In preparation for supporting Ingenic SoCs other than the JZ4740,
introduce MACH_INGENIC to Kconfig & move MACH_JZ4740 to a separate
entry selected by the board when appropriate. This allows MACH_INGENIC
to be used to enable things generic across Ingenic SoCs.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Andrew Bresticker <abrestic@chromium.org>
Patchwork: https://patchwork.linux-mips.org/patch/10130/


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

arch/mips/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -289,9 +289,8 @@ config MACH_JAZZ 
	 Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and

	 Olivetti M700-10 workstations.



config MACH_JZ4740

	bool "Ingenic JZ4740 based machines"

	select SYS_HAS_CPU_MIPS32_R1

config MACH_INGENIC

	bool "Ingenic SoC based machines"

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_ZBOOT_UART16550

arch/mips/configs/qi_lb60_defconfig

+1 −1
Original line number Diff line number Diff line 
CONFIG_MACH_JZ4740=y

CONFIG_MACH_INGENIC=y

# CONFIG_COMPACTION is not set

# CONFIG_CROSS_MEMORY_ATTACH is not set

CONFIG_HZ_100=y

arch/mips/jz4740/Kconfig

+6 −1
Original line number Diff line number Diff line 
choice

	prompt "Machine type"

	depends on MACH_JZ4740

	depends on MACH_INGENIC

	default JZ4740_QI_LB60



config JZ4740_QI_LB60

	bool "Qi Hardware Ben NanoNote"

	select MACH_JZ4740



endchoice



config MACH_JZ4740

	bool

	select SYS_HAS_CPU_MIPS32_R1

arch/mips/jz4740/Platform

+4 −4
Original line number Diff line number Diff line 
platform-$(CONFIG_MACH_JZ4740)	+= jz4740/

cflags-$(CONFIG_MACH_JZ4740)	+= -I$(srctree)/arch/mips/include/asm/mach-jz4740

load-$(CONFIG_MACH_JZ4740)	+= 0xffffffff80010000

zload-$(CONFIG_MACH_JZ4740)	+= 0xffffffff80600000
 
platform-$(CONFIG_MACH_INGENIC)	+= jz4740/

cflags-$(CONFIG_MACH_INGENIC)	+= -I$(srctree)/arch/mips/include/asm/mach-jz4740

load-$(CONFIG_MACH_INGENIC)	+= 0xffffffff80010000

zload-$(CONFIG_MACH_INGENIC)	+= 0xffffffff80600000