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

Commit b6c3b6a2 authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Greg Kroah-Hartman
Browse files

Fix allyesconfig output.



commit 1b496469d0c020e09124e03e66a81421c21272a7 upstream.

Conflict JCore-SoC and SolutionEngine 7619.

Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 135e7737
Loading
Loading
Loading
Loading
+3 −11
Original line number Diff line number Diff line
@@ -8,27 +8,19 @@ config SH_ALPHA_BOARD
	bool

config SH_DEVICE_TREE
	bool "Board Described by Device Tree"
	bool
	select OF
	select OF_EARLY_FLATTREE
	select TIMER_OF
	select COMMON_CLK
	select GENERIC_CALIBRATE_DELAY
	help
	  Select Board Described by Device Tree to build a kernel that
	  does not hard-code any board-specific knowledge but instead uses
	  a device tree blob provided by the boot-loader. You must enable
	  drivers for any hardware you want to use separately. At this
	  time, only boards based on the open-hardware J-Core processors
	  have sufficient driver coverage to use this option; do not
	  select it if you are using original SuperH hardware.

config SH_JCORE_SOC
	bool "J-Core SoC"
	depends on SH_DEVICE_TREE && (CPU_SH2 || CPU_J2)
	select SH_DEVICE_TREE
	select CLKSRC_JCORE_PIT
	select JCORE_AIC
	default y if CPU_J2
	depends on CPU_J2
	help
	  Select this option to include drivers core components of the
	  J-Core SoC, including interrupt controllers and timers.