From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57156C433FF for ; Fri, 2 Aug 2019 09:57:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2523820665 for ; Fri, 2 Aug 2019 09:57:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739870; bh=CLg68tfzKMVwWEvkzvAmfZIb7/a7kh58NQrcf00uExY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UV5mDbWyI91uznhYQ7oGUV9NJJ9Hh5R/75381zGM4pecPb9D4aRNhRF7Cvp/9uAPW Mn9L5CK5eoDe1uGCgKfm2lR5n7E7AKtcSbDOtpXBpLlryA5/8on8GigbWBWp6l8a5A F9//Dt3k87BKUDylT6JngcXs5oB10zn4blY4cPfo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406983AbfHBJ5t (ORCPT ); Fri, 2 Aug 2019 05:57:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:37096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406961AbfHBJ5n (ORCPT ); Fri, 2 Aug 2019 05:57:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4538421773; Fri, 2 Aug 2019 09:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739862; bh=CLg68tfzKMVwWEvkzvAmfZIb7/a7kh58NQrcf00uExY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IbRUiN9t78C3udHm+Fc6n+AeE/eVW53Q0R1P3rdm0EYww8e2zKw4x4/zGM5ugqxfY 2xj7/Tmuwut+qjwkBVt+6zMXt9KZWUf//NaUFeGvabHRkDWCKU6llyR/Xy5JPtlr/n jaSQ7KUPXNyD/JuhDaPF93dwUVekyGuH6azpSZyM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yoshinori Sato Subject: [PATCH 5.2 19/20] Fix allyesconfig output. Date: Fri, 2 Aug 2019 11:40:13 +0200 Message-Id: <20190802092103.845130875@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092055.131876977@linuxfoundation.org> References: <20190802092055.131876977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yoshinori Sato commit 1b496469d0c020e09124e03e66a81421c21272a7 upstream. Conflict JCore-SoC and SolutionEngine 7619. Signed-off-by: Yoshinori Sato Signed-off-by: Greg Kroah-Hartman --- arch/sh/boards/Kconfig | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) --- 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.