From patchwork Mon Oct 7 08:56:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 20845 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ED4EB24697 for ; Mon, 7 Oct 2013 08:58:19 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id e13sf13485139vbg.8 for ; Mon, 07 Oct 2013 01:58:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=h1L9fCP/HLBd4caTGDAKBAbN9YEmlDDsfronlfY0ki8=; b=E8MxdJ1wUMM8w7gEf9Kb6Qikg/DB1owiGnRq73xexP//7J11JpENmZ8fY2x/nIFhOR 8Z8ShpzpKh7oncidg51hVjlMRcf1MJIVtW9W2IqB5fL4qy7rDf9VgG2kOnBFCNNyqzCG dOwPAhm0hj97ZfAIkW4WV8DR0I8rbAxWH34p/gAzy1EXpPCb1k/EmFQ+H5yD2osiGQNl aiyYkaQE0LTEFgCn+5UfOhoplqC0Vx7vWToTD1l+uja2KxWFqqQlZpVNlTvfsWKIH2U7 VgBVhyAC6zPRrA+ZcCTFcE2hnufzZ3sQxjaoEoiggwHX9KAuxCJdipuWzgQbSGBHJ/FR BOkg== X-Received: by 10.236.32.74 with SMTP id n50mr27877390yha.13.1381136299796; Mon, 07 Oct 2013 01:58:19 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.83.72 with SMTP id o8ls545647qey.0.gmail; Mon, 07 Oct 2013 01:58:19 -0700 (PDT) X-Received: by 10.52.118.73 with SMTP id kk9mr21338976vdb.13.1381136299693; Mon, 07 Oct 2013 01:58:19 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id d14si7552431veh.39.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Oct 2013 01:58:19 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id jy13so3464632veb.5 for ; Mon, 07 Oct 2013 01:58:19 -0700 (PDT) X-Gm-Message-State: ALoCoQnRiAQkIGjvo+AbgfLH0xv0ns2e1oKIAGZ/RUmCscfZQGOvgIdFS/UV76uLsTp/xFmxXZBt X-Received: by 10.58.137.167 with SMTP id qj7mr25208400veb.1.1381136299608; Mon, 07 Oct 2013 01:58:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp109118vcz; Mon, 7 Oct 2013 01:58:18 -0700 (PDT) X-Received: by 10.204.64.78 with SMTP id d14mr587216bki.40.1381136298350; Mon, 07 Oct 2013 01:58:18 -0700 (PDT) Received: from mail-bk0-f54.google.com (mail-bk0-f54.google.com [209.85.214.54]) by mx.google.com with ESMTPS id mc8si3975832bkb.105.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Oct 2013 01:58:18 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.54 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.214.54; Received: by mail-bk0-f54.google.com with SMTP id mz12so2532944bkb.13 for ; Mon, 07 Oct 2013 01:58:17 -0700 (PDT) X-Received: by 10.204.61.195 with SMTP id u3mr551550bkh.43.1381136297590; Mon, 07 Oct 2013 01:58:17 -0700 (PDT) Received: from slackpad.drs.calxeda.com (f053086134.adsl.alicedsl.de. [78.53.86.134]) by mx.google.com with ESMTPSA id a4sm16393354bko.11.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Oct 2013 01:58:16 -0700 (PDT) From: Andre Przywara To: albert.u.boot@aribaud.net Cc: trini@ti.com, u-boot@lists.denx.de, Masahiro Yamada , patches@linaro.org, Andre Przywara Subject: [PATCH] ARM: virtualization: replace verbose license with SPDX identifier Date: Mon, 7 Oct 2013 10:56:51 +0200 Message-Id: <1381136211-11366-1-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andre.przywara@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The original creation of arch/arm/cpu/armv7/{virt-v7.c,nonsec_virt.S} predates the SPDX conversion, so the original elaborate license statements sneaked in. Fix this by replacing them with the proper abbreviation. Signed-off-by: Andre Przywara --- arch/arm/cpu/armv7/nonsec_virt.S | 18 +----------------- arch/arm/cpu/armv7/virt-v7.c | 20 ++------------------ 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 358348f..24b4c18 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -3,23 +3,7 @@ * * Copyright (c) 2013 Andre Przywara * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program 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 program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index 6de7fe7..2cd604f 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -1,28 +1,12 @@ /* * (C) Copyright 2013 - * Andre Przywara, Linaro + * Andre Przywara, Linaro * * Routines to transition ARMv7 processors from secure into non-secure state * and from non-secure SVC into HYP mode * needed to enable ARMv7 virtualization for current hypervisors * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program 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 program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ #include