diff options
| author | Yoshinori Sato | 2019-04-21 15:53:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-08-04 09:30:57 +0200 |
| commit | b6c3b6a2c66280a5a7c272adce5f30733de6bfc1 (patch) | |
| tree | 0e6ab03ecd9cf5c6e9ad7af8e9cfab21748c9c49 | |
| parent | drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl (diff) | |
| download | kernel-qcow2-linux-b6c3b6a2c66280a5a7c272adce5f30733de6bfc1.tar.gz kernel-qcow2-linux-b6c3b6a2c66280a5a7c272adce5f30733de6bfc1.tar.xz kernel-qcow2-linux-b6c3b6a2c66280a5a7c272adce5f30733de6bfc1.zip | |
Fix allyesconfig output.
commit 1b496469d0c020e09124e03e66a81421c21272a7 upstream.
Conflict JCore-SoC and SolutionEngine 7619.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/sh/boards/Kconfig | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index 6394b4f0a69b..f42feab25dcf 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -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. |