Fix allyesconfig output. [Linux 4.14.136]

This Linux kernel change "Fix allyesconfig output" is included in the Linux 4.14.136 release. This change is authored by Yoshinori Sato <ysato [at] users.sourceforge.jp> on Sun Apr 21 22:53:58 2019 +0900. The commit for this change in Linux stable tree is 9b3c3f8 (patch) which is from upstream commit 1b49646. The same Linux upstream change may have been applied to various maintained Linux releases and you can find all Linux releases containing changes from upstream 1b49646.

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>

There are 14 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/sh/boards/Kconfig | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 6394b4f..f42feab 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.

Leave a Reply

Your email address will not be published. Required fields are marked *