From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshinori Sato Date: Tue, 10 May 2016 07:28:23 +0000 Subject: Re: [PATCH RESEND 03/12] sh: Disable board specific code in OF mode Message-Id: <87eg9ape20.wl-ysato@users.sourceforge.jp> List-Id: References: <1462079316-27771-1-git-send-email-ysato@users.sourceforge.jp> <1462079316-27771-4-git-send-email-ysato@users.sourceforge.jp> <20160504024941.GN21636@brightrain.aerifal.cx> In-Reply-To: <20160504024941.GN21636@brightrain.aerifal.cx> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Rich Felker Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Sorry too late reply. On Wed, 04 May 2016 11:49:41 +0900, Rich Felker wrote: > > On Sun, May 01, 2016 at 02:08:27PM +0900, Yoshinori Sato wrote: > > Board specific code conflict on of-generic. > > > > Signed-off-by: Yoshinori Sato > > --- > > arch/sh/Makefile | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/arch/sh/Makefile b/arch/sh/Makefile > > index bf5b3f5..8ff943b 100644 > > --- a/arch/sh/Makefile > > +++ b/arch/sh/Makefile > > @@ -130,6 +130,9 @@ head-y := arch/sh/kernel/head_$(BITS).o > > core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/ > > core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/ > > > > +core-$(CONFIG_USE_BUILTIN_DTB) += arch/sh/boot/dts/ > > + > > It looks like you inadvertently mixed the builtin-dtb patch with this > commit. Is yours based on the builtin-dtb patch I posted to the list > or a different approach? Oh sorry. It changes same. I mistake origin version. > > +ifneq ($(CONFIG_SH_DEVICE_TREE),y) > > # Mach groups > > machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se > > machdir-$(CONFIG_SH_HP6XX) += mach-hp6xx > > @@ -150,6 +153,7 @@ machdir-$(CONFIG_SH_LANDISK) += mach-landisk > > machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2 > > machdir-$(CONFIG_SH_CAYMAN) += mach-cayman > > machdir-$(CONFIG_SH_RSK) += mach-rsk > > +endif > > Is this actually necessary? I thought SH_DEVICE_TREE was mutually > exclusive with board-specific configs at the Kconfig level. If not, it > should probably be handled that way rather than with logic like this > in the Makefile. Hmm. I think Kconfig level exclsive more better. > > > ifneq ($(machdir-y),) > > core-y += $(addprefix arch/sh/boards/, \ > > @@ -222,6 +226,13 @@ archclean: > > $(Q)$(MAKE) $(clean)=$(boot) > > $(Q)$(MAKE) $(clean)=arch/sh/kernel/vsyscall > > > > +%.dtb %.dtb.S %.dtb.o: | scripts > > + $(Q)$(MAKE) $(build)=arch/sh/boot/dts arch/sh/boot/dts/$@ > > + > > +PHONY += dtbs > > +dtbs: scripts > > + $(Q)$(MAKE) $(build)=arch/sh/boot/dts > > + > > define archhelp > > @echo ' zImage - Compressed kernel image' > > @echo ' romImage - Compressed ROM image, if supported' > > -- > > More builtin-dtb stuff. > > Rich -- Yoshinori Sato From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751338AbcEJH22 (ORCPT ); Tue, 10 May 2016 03:28:28 -0400 Received: from mail2.asahi-net.or.jp ([202.224.39.198]:9184 "EHLO mail2.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750858AbcEJH21 (ORCPT ); Tue, 10 May 2016 03:28:27 -0400 Date: Tue, 10 May 2016 16:28:23 +0900 Message-ID: <87eg9ape20.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: Rich Felker Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH RESEND 03/12] sh: Disable board specific code in OF mode In-Reply-To: <20160504024941.GN21636@brightrain.aerifal.cx> References: <1462079316-27771-1-git-send-email-ysato@users.sourceforge.jp> <1462079316-27771-4-git-send-email-ysato@users.sourceforge.jp> <20160504024941.GN21636@brightrain.aerifal.cx> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/24.5 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sorry too late reply. On Wed, 04 May 2016 11:49:41 +0900, Rich Felker wrote: > > On Sun, May 01, 2016 at 02:08:27PM +0900, Yoshinori Sato wrote: > > Board specific code conflict on of-generic. > > > > Signed-off-by: Yoshinori Sato > > --- > > arch/sh/Makefile | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/arch/sh/Makefile b/arch/sh/Makefile > > index bf5b3f5..8ff943b 100644 > > --- a/arch/sh/Makefile > > +++ b/arch/sh/Makefile > > @@ -130,6 +130,9 @@ head-y := arch/sh/kernel/head_$(BITS).o > > core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/ > > core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/ > > > > +core-$(CONFIG_USE_BUILTIN_DTB) += arch/sh/boot/dts/ > > + > > It looks like you inadvertently mixed the builtin-dtb patch with this > commit. Is yours based on the builtin-dtb patch I posted to the list > or a different approach? Oh sorry. It changes same. I mistake origin version. > > +ifneq ($(CONFIG_SH_DEVICE_TREE),y) > > # Mach groups > > machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se > > machdir-$(CONFIG_SH_HP6XX) += mach-hp6xx > > @@ -150,6 +153,7 @@ machdir-$(CONFIG_SH_LANDISK) += mach-landisk > > machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2 > > machdir-$(CONFIG_SH_CAYMAN) += mach-cayman > > machdir-$(CONFIG_SH_RSK) += mach-rsk > > +endif > > Is this actually necessary? I thought SH_DEVICE_TREE was mutually > exclusive with board-specific configs at the Kconfig level. If not, it > should probably be handled that way rather than with logic like this > in the Makefile. Hmm. I think Kconfig level exclsive more better. > > > ifneq ($(machdir-y),) > > core-y += $(addprefix arch/sh/boards/, \ > > @@ -222,6 +226,13 @@ archclean: > > $(Q)$(MAKE) $(clean)=$(boot) > > $(Q)$(MAKE) $(clean)=arch/sh/kernel/vsyscall > > > > +%.dtb %.dtb.S %.dtb.o: | scripts > > + $(Q)$(MAKE) $(build)=arch/sh/boot/dts arch/sh/boot/dts/$@ > > + > > +PHONY += dtbs > > +dtbs: scripts > > + $(Q)$(MAKE) $(build)=arch/sh/boot/dts > > + > > define archhelp > > @echo ' zImage - Compressed kernel image' > > @echo ' romImage - Compressed ROM image, if supported' > > -- > > More builtin-dtb stuff. > > Rich -- Yoshinori Sato