[PATCH v6 07/25] arm: rpi: Add a devicetree file for rpi_4

[Peter Robinson]

On Thu, Dec 2, 2021 at 6:26 PM Simon Glass <sjg at chromium.org> wrote:
>
> Hi Mark,
>
> On Thu, 2 Dec 2021 at 10:34, Mark Kettenis <mark.kettenis at xs4all.nl> wrote:
> >
> > > From: Simon Glass <sjg at chromium.org>
> > > Date: Thu,  2 Dec 2021 08:59:01 -0700
> > >
> > > Add this file, obtained from the Raspbian boot disk, so there is a
> > > reference devicetree in the U-Boot tree. The same one is used for
> > > 32- and 64-bit variants.
> > >
> > > Note that U-Boot does not normally need this at runtime, since
> > > CONFIG_OF_BOARD is enabled. The previous firmware stage provides a
> > > devicetree at runtime.
> > >
> > > Signed-off-by: Simon Glass <sjg at chromium.org>
> > > ---
> > >
> > > (no changes since v1)
> > >
> > >  arch/arm/dts/Makefile            |    3 +-
> > >  arch/arm/dts/bcm2711-rpi-4-b.dts | 1958 ++++++++++++++++++++++++++++++
> > >  configs/rpi_4_32b_defconfig      |    1 +
> > >  configs/rpi_4_defconfig          |    1 +
> > >  configs/rpi_arm64_defconfig      |    1 +
> > >  5 files changed, 1963 insertions(+), 1 deletion(-)
> > >  create mode 100644 arch/arm/dts/bcm2711-rpi-4-b.dts
> > >
> > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > > index 2d92b2f940d..9cddab37207 100644
> > > --- a/arch/arm/dts/Makefile
> > > +++ b/arch/arm/dts/Makefile
> > > @@ -1077,7 +1077,8 @@ dtb-$(CONFIG_ARCH_BCM283X) += \
> > >       bcm2837-rpi-3-a-plus.dtb \
> > >       bcm2837-rpi-3-b.dtb \
> > >       bcm2837-rpi-3-b-plus.dtb \
> > > -     bcm2837-rpi-cm3-io3.dtb
> > > +     bcm2837-rpi-cm3-io3.dtb \
> > > +     bcm2711-rpi-4-b.dtb
> > >
> > >  dtb-$(CONFIG_ARCH_BCM63158) += \
> > >       bcm963158.dtb
> > > diff --git a/arch/arm/dts/bcm2711-rpi-4-b.dts b/arch/arm/dts/bcm2711-rpi-4-b.dts
> > > new file mode 100644
> > > index 00000000000..425e9fb91c4
> > > --- /dev/null
> > > +++ b/arch/arm/dts/bcm2711-rpi-4-b.dts
> > > @@ -0,0 +1,1958 @@
> > > +// SPDX-License-Identifier: GPL-2.0+ OR MIT
> > > +/*
> > > + * Sample device tree for rpi_4
> > > +
> > > + * Copyright 2021 Google LLC
> > > + */
> >
> > This is of course an utter lie.  This wasn't written from scratch by a
> > Google employee.
> >
> > The original copyright and license for the dtb files you
> > "disassembled" applies.  You don't specify exactly where you obtained
> > the file from, but it probably came from here:
> >
> >   https://github.com/raspberrypi/firmware
> >
> > And the README.md for that repo states that:
> >
> >   "The dtbs, overlays and associated README are built from Linux
> >    kernel sources, released under the GPL (see boot/COPYING.linux)"
> >
> > They're probably talking about their own fork of the Linux kernel
> > sources here as there are still differences between their device trees
> > and the the device trees in the official Linux tree.  But if you
> > insist on having a device tree in the U-Boot tree, that's where you
> > should look.
>
> IANAL and didn't consider this point.
>
> I got this from the boot disk (using fdtdump) and it does not include
> a copyright message. I'll change this in the next version.

Should probably just get the original one from their upstream source
repo then rather than decompiling it.