hw/arm/bcm283x: Correct the license text
Subsystems (2)
PATCH 1/1 hw/arm/bcm283x: Correct the license text
The license is the 'GNU General Public License v2.0 or later', not 'and':
This program is free software; you can redistribute it and/ori 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.
Fix the license comment.
--- include/hw/arm/bcm2835_peripherals.h | 3 ++- include/hw/arm/bcm2836.h | 3 ++- include/hw/char/bcm2835_aux.h | 3 ++- include/hw/display/bcm2835_fb.h | 3 ++- include/hw/dma/bcm2835_dma.h | 4 +++- include/hw/intc/bcm2835_ic.h | 4 +++- include/hw/intc/bcm2836_control.h | 3 ++- include/hw/misc/bcm2835_mbox.h | 4 +++- include/hw/misc/bcm2835_mbox_defs.h | 4 +++- include/hw/misc/bcm2835_property.h | 4 +++- hw/arm/bcm2835_peripherals.c | 3 ++- hw/arm/bcm2836.c | 3 ++- hw/arm/raspi.c | 3 ++- hw/display/bcm2835_fb.c | 1 - hw/dma/bcm2835_dma.c | 4 +++- hw/intc/bcm2835_ic.c | 4 ++-- hw/intc/bcm2836_control.c | 4 +++- hw/misc/bcm2835_mbox.c | 4 +++- hw/misc/bcm2835_property.c | 4 +++- 19 files changed, 45 insertions(+), 20 deletions(-)
include/hw/arm/bcm2835_peripherals.h +2 -1
@@ -5,7 +5,8 @@* Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft * Written by Andrew Baumann * -* This code is licensed under the GNU GPLv2 and later. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2835_PERIPHERALS_H
include/hw/arm/bcm2836.h +2 -1
@@ -5,7 +5,8 @@* Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft * Written by Andrew Baumann * -* This code is licensed under the GNU GPLv2 and later. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2836_H
include/hw/char/bcm2835_aux.h +2 -1
@@ -2,7 +2,8 @@* Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft * Written by Andrew Baumann * -* This code is licensed under the GNU GPLv2 and later. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2835_AUX_H
include/hw/display/bcm2835_fb.h +2 -1
@@ -5,7 +5,8 @@* Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft * Written by Andrew Baumann * -* This code is licensed under the GNU GPLv2 and later. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2835_FB_H
include/hw/dma/bcm2835_dma.h +3 -1
@@ -1,6 +1,8 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2835_DMA_H
include/hw/intc/bcm2835_ic.h +3 -1
@@ -1,6 +1,8 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2835_IC_H
include/hw/intc/bcm2836_control.h +2 -1
@@ -8,7 +8,8 @@* ARM Local Timer IRQ Copyright (c) 2019. Zoltán Baldaszti * Added basic IRQ_TIMER interrupt support * -* This code is licensed under the GNU GPLv2 and later. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2836_CONTROL_H
include/hw/misc/bcm2835_mbox.h +3 -1
@@ -1,6 +1,8 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2835_MBOX_H
include/hw/misc/bcm2835_mbox_defs.h +3 -1
@@ -1,6 +1,8 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2835_MBOX_DEFS_H
include/hw/misc/bcm2835_property.h +3 -1
@@ -1,6 +1,8 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #ifndef BCM2835_PROPERTY_H
hw/arm/bcm2835_peripherals.c +2 -1
@@ -5,7 +5,8 @@* Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft * Written by Andrew Baumann * -* This code is licensed under the GNU GPLv2 and later. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h"
hw/arm/bcm2836.c +2 -1
@@ -5,7 +5,8 @@* Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft * Written by Andrew Baumann * -* This code is licensed under the GNU GPLv2 and later. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h"
hw/arm/raspi.c +2 -1
@@ -8,7 +8,8 @@* Raspberry Pi 3 emulation Copyright (c) 2018 Zoltán Baldaszti * Upstream code cleanup (c) 2018 Pekka Enberg * -* This code is licensed under the GNU GPLv2 and later. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h"
hw/display/bcm2835_fb.c +0 -1
@@ -1,7 +1,6 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade * Refactoring for Pi2 Copyright (c) 2015, Microsoft. Written by Andrew Baumann. -* This code is licensed under the GNU GPLv2 and later. * * Heavily based on milkymist-vgafb.c, copyright terms below: * QEMU model of the Milkymist VGA framebuffer.
hw/dma/bcm2835_dma.c +3 -1
@@ -1,6 +1,8 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h"
hw/intc/bcm2835_ic.c +2 -2
@@ -1,7 +1,6 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade * Refactoring for Pi2 Copyright (c) 2015, Microsoft. Written by Andrew Baumann. -* This code is licensed under the GNU GPLv2 and later. * Heavily based on pl190.c, copyright terms below: * * Arm PrimeCell PL190 Vector Interrupt Controller
@@ -9,7 +8,8 @@* Copyright (c) 2006 CodeSourcery. * Written by Paul Brook * -* This code is licensed under the GPL. +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h"
hw/intc/bcm2836_control.c +3 -1
@@ -4,7 +4,6 @@* Written by Andrew Baumann * * Based on bcm2835_ic.c (Raspberry Pi emulation) (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. * * At present, only implements interrupt routing, and mailboxes (i.e., * not PMU interrupt, or AXI counters).
@@ -13,6 +12,9 @@* * Ref: * https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2836/QA7_rev3.4.pdf +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h"
hw/misc/bcm2835_mbox.c +3 -1
@@ -1,11 +1,13 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. * * This file models the system mailboxes, which are used for * communication with low-bandwidth GPU peripherals. Refs: * https://github.com/raspberrypi/firmware/wiki/Mailboxes * https://github.com/raspberrypi/firmware/wiki/Accessing-mailboxes +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h"
hw/misc/bcm2835_property.c +3 -1
@@ -1,6 +1,8 @@/* * Raspberry Pi emulation (c) 2012 Gregory Estrade -* This code is licensed under the GNU GPLv2 and later. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h"
Signature · 1 line
2.21.1
Peter Maydell
AppliedQuoted 4 lines · Philippe Mathieu-Daudé
The license is the 'GNU General Public License v2.0 or later', not 'and':
Quoted 8 lines
This program is free software; you can redistribute it and/ori 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.
Fix the license comment.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
I was hoping for an ack from Andrew, but in any case I think the original licensing intention was clear and this is just a fixup on the wording.
Applied to target-arm.next, thanks.
-- PMM