Re: [PATCH 3/5] x86/of: Add building device tree blob(s) into image.

[Dirk Brandewie]

On 11/16/2010 10:02 PM, Grant Likely wrote:
> On Tue, Nov 16, 2010 at 02:41:38PM -0800, dirk.brandewie@xxxxxxxxx wrote:
> > From: Dirk Brandewie<dirk.brandewie@xxxxxxxxx>
> >
> > This patch adds linking device tree blobs into vmlinux. DTB's are
> > added by adding the blob object name to list of objects to be linked
> > into the image.
> > e.g:
> >    obj-$(CONFIG_TEST_DTB) += test.dtb.o
> >
> > The set of DTB linked into the image is controlled the Kconfig file
> > in arch/x86/kernel/dts/Kconfig
> >
> > Signed-off-by: Dirk Brandewie<dirk.brandewie@xxxxxxxxx>
> > ---
> >   arch/x86/Kconfig            |    6 +++++-
> >   arch/x86/kernel/Makefile    |    6 ++++++
> >   arch/x86/kernel/dts/Kconfig |    7 +++++++
> >   3 files changed, 18 insertions(+), 1 deletions(-)
> >   create mode 100644 arch/x86/kernel/dts/Kconfig
> >
> > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> > index 5904f38..f2f516a 100644
> > --- a/arch/x86/Kconfig
> > +++ b/arch/x86/Kconfig
> > @@ -299,13 +299,17 @@ config X86_BIGSMP
> >   	---help---
> >   	  This option is needed for the systems that have more than 8 CPUs
> >
> > -config X86_OF
> > +menuconfig X86_OF
> >   	bool "Support for device tree"
> >   	select OF
> >   	select OF_FLATTREE
> >   	---help---
> >   	  Device tree support on X86.
> >
> > +if X86_OF
> > +source arch/x86/kernel/dts/Kconfig
> > +endif
> > +
> >   if X86_32
> >   config X86_EXTENDED_PLATFORM
> >   	bool "Support for extended (non-PC) x86 platforms"
> > diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
> > index 586df14..49e017d 100644
> > --- a/arch/x86/kernel/Makefile
> > +++ b/arch/x86/kernel/Makefile
> > @@ -114,6 +114,12 @@ obj-$(CONFIG_SWIOTLB)			+= pci-swiotlb.o
> >   obj-$(CONFIG_X86_OF)			+= prom.o
> >
> >   ###
> > +# device tree blobs
> > +obj-$(CONFIG_CE4100_DTB) += ce4100.dtb.o
> > +obj-$(CONFIG_TEST_DTB) += test.dtb.o
> > +
> > +
> > +###
> >   # 64 bit specific files
> >   ifeq ($(CONFIG_X86_64),y)
> >   	obj-$(CONFIG_AUDIT)		+= audit_64.o
> > diff --git a/arch/x86/kernel/dts/Kconfig b/arch/x86/kernel/dts/Kconfig
> > new file mode 100644
> > index 0000000..d3e5cd4
> > --- /dev/null
> > +++ b/arch/x86/kernel/dts/Kconfig
> > @@ -0,0 +1,7 @@
> > +config CE4100_DTB
> > +       bool "Intel CE4100"
> > +
> > +config TEST_DTB
> > +       bool "Test DTS"
> > +
> > +
>
> As previously mentioned, this isn't going to scale.  Need to look at
> allowing the user to specify a list of .dtbs that will be linked in.

These config variables will likely get pushed into being set when the
platform configuration is selected. I still need to talk to the x86 maintainers
and my distribution team to figure out what is going to happen here.

> g.
>
> > --
> > 1.7.2.3
> >
> > _______________________________________________
> > devicetree-discuss mailing list
> > devicetree-discuss@xxxxxxxxxxxxxxxx
> > https://lists.ozlabs.org/listinfo/devicetree-discuss

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/