From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=lmydMiGQ; spf=pass (domain: linaro.org, ip: 209.85.128.45, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by groups.io with SMTP; Tue, 09 Jul 2019 09:07:50 -0700 Received: by mail-wm1-f45.google.com with SMTP id l2so3855170wmg.0 for ; Tue, 09 Jul 2019 09:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zkiqLG3FUmLzRCgqT4yobCmhQ4BcsEnWG74v8sYQ15Y=; b=lmydMiGQEqsO9q8HqwZFR9BPxhyjh89iqQa5wxZpDmxkvcRdTzitlmPlDhA4TOCjn8 TBKxHmdl8WJs6pn3QHnHnTXL6pnnEICC5R550Hv/6H0LGf7G09Qe+jCXy1uzWlaUOumJ lryDxphiwK8gG9w+sdJMvdCdzQW2Hhh5kFYTwkVRA/sj6l1SaK3hiuPyPbIXo/KuoZVm Ryw5sJ7EKP8HGNkRlKVtPD4vSGLahAyMLnkyJHXydB7yJNIsDwMsFXFhPJaZ3skE6Mvg QByzn78b5zl+Mah21PAdNuIEip/lBCyr+LxPh1Sfb8o3JOOESdvh6uuikRSNSODyPnUH LE1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zkiqLG3FUmLzRCgqT4yobCmhQ4BcsEnWG74v8sYQ15Y=; b=FTw3xEXcp2RRtvv5vyvHX1JoJ5JJkk7jNN2k1pksJ/uQwgqhEnFOY8Zx1cVbJB1oZX sbRx4UeQwU0QLAth6WPDrGDDO3IWXiG8vXtCslZe8R+vAfHERjN6JS+c3DrwN8FW07vs q+tbuL+rnE9ggErssn6m+m8cOjyxXwefGrJhfLirJ2MqypO1V4Oaxj/c8hK8UiKp6dcM h7i7CNWFt42DrwcFz3m6XAZLISM5X4p2bEqx6ruokY8K/mtvJPOl/KUV9Oi4XTxETCvJ paLdBRy0naARY7RhFmz82jD/o15sIRd5hRy0zObIwJkLujf2tvQkfr8JO8Fpcq5gkHcd EqZQ== X-Gm-Message-State: APjAAAVBjPsXCILmyDnCVzpBVnNXbSKpNGiw5T4iqlGnCAakEoxv5Zr2 3n+jnILh0jXIqTfH4syqb9V+nBYNs6A= X-Google-Smtp-Source: APXvYqxqxmt7fa4F3Jys+HWQGra6iSDzwl0nSuT7C8JpTPnTpsNZ4QMPVXy/12dBokKt3ilQmTPcYQ== X-Received: by 2002:a7b:ce01:: with SMTP id m1mr622519wmc.1.1562688468760; Tue, 09 Jul 2019 09:07:48 -0700 (PDT) Return-Path: Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id s12sm2083663wmh.34.2019.07.09.09.07.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 09:07:47 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Michael D Kinney Subject: [PATCH edk2-platforms 1/3] Platform,Silicon RPi3: update license headers to BSD+Patent Date: Tue, 9 Jul 2019 17:07:42 +0100 Message-Id: <20190709160744.5898-2-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190709160744.5898-1-leif.lindholm@linaro.org> References: <20190709160744.5898-1-leif.lindholm@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit RpiMbox.h and Bcm2836.h originate from Ard's original efforts, and were always intended to be 2-clause BSD licensed, but due to a copy/paste error, they ended up with a 3-clause BSD license instead - which meant they were left out in Mike's major relicensing set. (This is explained/confirmed in https://edk2.groups.io/g/devel/message/40909 and https://edk2.groups.io/g/devel/message/40911.) This patch replaces the license headers in both with the SPDX statement bringing it inline with the majority of the rest of the codebase. Signed-off-by: Leif Lindholm Cc: Ard Biesheuvel Cc: Michael D Kinney --- Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h | 26 +------------------------- Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h | 26 +------------------------- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h b/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h index 8547ad05ba61..d3b6f117cfdf 100644 --- a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h +++ b/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h @@ -3,31 +3,7 @@ * Copyright (c) 2019, Pete Batard * Copyright (c) 2016, Linaro Limited. All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause-Patent * **/ diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h index f06eb2312c61..4007301228be 100644 --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h @@ -3,31 +3,7 @@ * Copyright (c) 2017, Andrei Warkentin * Copyright (c) 2016, Linaro Limited. All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause-Patent * **/ -- 2.20.1