On 27 July 2016 at 03:58, Hans de Goede <hdego...@redhat.com> wrote: > There is a new Orange Pi PC *Plus* version available now, > this is an extended version of the regular Orange Pi PC > with sdio wifi and an eMMC. > > The upstream kernel devs have decided that they want a separate > dts for the PC Plus rather then sharing a single dts between the > regular PC and the PC Plus. So add a new orangepi_pc_plus_defconfig > to match. > > The added dts file matches the one submitted to the upstream kernel. > > Signed-off-by: Hans de Goede <hdego...@redhat.com> > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts | 87 > ++++++++++++++++++++++ > board/sunxi/MAINTAINERS | 1 + > configs/orangepi_pc_defconfig | 1 - > ...epi_pc_defconfig => orangepi_pc_plus_defconfig} | 3 +- > 5 files changed, 90 insertions(+), 3 deletions(-) > create mode 100644 arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts > copy configs/{orangepi_pc_defconfig => orangepi_pc_plus_defconfig} (84%) > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index ca8712a..1c3b705 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -246,6 +246,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ > sun8i-h3-orangepi-lite.dtb \ > sun8i-h3-orangepi-one.dtb \ > sun8i-h3-orangepi-pc.dtb \ > + sun8i-h3-orangepi-pc-plus.dtb \ > sun8i-h3-orangepi-plus.dtb > dtb-$(CONFIG_MACH_SUN50I) += \ > sun50i-a64-pine64-plus.dtb \ > diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts > b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts > new file mode 100644 > index 0000000..9a8cdd4 > --- /dev/null > +++ b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts > @@ -0,0 +1,87 @@ > +/* > + * Copyright (C) 2016 Hans de Goede <hdego...@redhat.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This file is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */
Just to understand - why should all these sun*.dts files are not to follow u-boot licence (just because Linux has same)? SPDX-License-Identifier: GPL-2.0+ -- Jagan. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot