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: 280997 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 980D62C0090 for ; Mon, 7 Oct 2013 19:58:42 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3A09E4A096; Mon, 7 Oct 2013 10:58:39 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id brWlLVzlNh3E; Mon, 7 Oct 2013 10:58:39 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 474864A080; Mon, 7 Oct 2013 10:58:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 704414A080 for ; Mon, 7 Oct 2013 10:58:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XKZ1oIduUl9i for ; Mon, 7 Oct 2013 10:58:24 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-bk0-f48.google.com (mail-bk0-f48.google.com [209.85.214.48]) by theia.denx.de (Postfix) with ESMTPS id 6DA7F4A018 for ; Mon, 7 Oct 2013 10:58:18 +0200 (CEST) Received: by mail-bk0-f48.google.com with SMTP id my13so2443017bkb.7 for ; Mon, 07 Oct 2013 01:58:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=h1L9fCP/HLBd4caTGDAKBAbN9YEmlDDsfronlfY0ki8=; b=aHKo7+Ziq/DMiuN9MVskD2NysIeSNcl9+mieIcf/Lg55vWtWS99Y/C6EV3WCEBMZ9z fAk0wFQtS8Ap75KMUAYbb+652PsMjBsOAOsmD06Y4AeBGisOAq48+0QXKYjCqF9ToLze zt9HlRUwGXl/qis4GA9Yhqy9rtlkcmrIs/TDkzluCIuuSzLhtthTGRqzjztiH6Fr/lol Vzb2jZ8Q9x0tydS4+NQhpzMQvPpr6scmMSJvb9eohyIob5+KMmOtKtaxCyWwiEf5nAiU RJOLnOOORhbJ+NKZ2Lwz1DCzjRp6bhluqOQvUrT8COHDK+8vhtlgIbreh5w/yeir1nmP 8sww== X-Gm-Message-State: ALoCoQkkfzWNvPSz3oOugDRUNVil5MtVfwOUJkskaLPL9eyUY7+NbT7sOEsNYMqbHYvPKK3UbzIl 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 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 Cc: trini@ti.com, u-boot@lists.denx.de, patches@linaro.org Subject: [U-Boot] [PATCH] ARM: virtualization: replace verbose license with SPDX identifier X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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