Merge changes from topic "mit-license" into integration

* changes:
  fix(dt-bindings): fix static checks
  docs(license): rectify `arm-gic.h` license
This commit is contained in:
Olivier Deprez 2021-04-28 14:36:20 +02:00 committed by TrustedFirmware Code Review
commit 967f0621b9
8 changed files with 39 additions and 6 deletions

View File

@ -76,5 +76,14 @@ license text is included in those source files.
BSD-3-Clause license. Any contributions to this code must be made under the
terms of both licenses.
- Some source files originating from the Linux source tree, which are
disjunctively dual licensed (GPL-2.0 OR MIT), are redistributed under the
terms of the MIT license. These files are:
- ``include/dt-bindings/interrupt-controller/arm-gic.h``
See the original `Linux MIT license`_.
.. _FreeBSD: http://www.freebsd.org
.. _Linux MIT license: https://raw.githubusercontent.com/torvalds/linux/master/LICENSES/preferred/MIT
.. _SCC: http://www.simple-cc.org/

View File

@ -11,8 +11,8 @@
#define AFF
#define REG_32
#include "fvp-defs.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "fvp-defs.dtsi"
/memreserve/ 0x80000000 0x00010000;

View File

@ -10,8 +10,8 @@
#define AFF
#include "fvp-defs.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "fvp-defs.dtsi"
/memreserve/ 0x80000000 0x00010000;

View File

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <services/sdei_flags.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <services/sdei_flags.h>
#define LEVEL 0
#define EDGE 2

View File

@ -11,8 +11,8 @@
#define AFF
#define CLUSTER_COUNT 1
#include "fvp-defs.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "fvp-defs.dtsi"
/memreserve/ 0x80000000 0x00010000;

View File

@ -11,8 +11,8 @@
#define AFF
#define CLUSTER_COUNT 1
#include "fvp-defs.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "fvp-defs.dtsi"
/memreserve/ 0x80000000 0x00010000;

View File

@ -1,5 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
/*
* Copyright (c) 2019-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: MIT
*
* This header provides constants for the ARM GIC.
*/

21
licenses/LICENSE.MIT Normal file
View File

@ -0,0 +1,21 @@
MIT License
Copyright (c) [year] [fullname]
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.