lkml.org 
[lkml]   [2016]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH RESEND 03/12] sh: Disable board specific code in OF mode
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 <ysato@users.sourceforge.jp>
> > ---
> > 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
<ysato@users.sourceforge.jp>

\
 
 \ /
  Last update: 2016-05-10 10:01    [W:0.055 / U:1.572 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site