Merge pull request #925 from dp-arm/dp/spdx

Use SPDX license identifiers

diff --cc bl32/tsp/aarch64/tsp_entrypoint.S
Simple merge

diff --cc bl32/tsp/tsp_main.c
index b4010f36109bdcaa7822209cbc057c92e3b89168,dd8936f2c73d696a71b466a3f0c832ca242275bb..0de0ca8564f5a8e5fde79dd5247ae3e1cd058579
--- 1/bl32/tsp/tsp_main.c
--- 2/bl32/tsp/tsp_main.c
+++ b/bl32/tsp/tsp_main.c
@@@ -1,31 -1,7 +1,7 @@@
  /*
 - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
 + * Copyright (c) 2013-2017, ARM Limited and Contributors. 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-3-Clause
   */
  
  #include <arch_helpers.h>

diff --cc common/runtime_svc.c
index 52990b332e7420b3385a7f1b57bb6df3aba489ee,8b8145e232a78a34854fd63c96e772fdaad128ac..7b38847be9f9bf0ccce3bf9cfce11cdc9b4999a8
--- 1/common/runtime_svc.c
--- 2/common/runtime_svc.c
+++ b/common/runtime_svc.c
@@@ -1,31 -1,7 +1,7 @@@
  /*
 - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
 + * Copyright (c) 2013-2017, ARM Limited and Contributors. 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-3-Clause
   */
  
  #include <assert.h>

diff --cc include/bl32/tsp/tsp.h
index 08a6bfca9ffec0d18d4ae91fbb47aab1a345f1af,599cd2ce6d9df60533727421d37ebcbc2c07d571..43bba8f5ec732fa11c949b31ba2825569a724e91
--- 1/include/bl32/tsp/tsp.h
--- 2/include/bl32/tsp/tsp.h
+++ b/include/bl32/tsp/tsp.h
@@@ -1,31 -1,7 +1,7 @@@
  /*
 - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
 + * Copyright (c) 2013-2017, ARM Limited and Contributors. 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-3-Clause
   */
  
  #ifndef __TSP_H__

diff --cc include/lib/smcc.h
Simple merge

diff --cc lib/xlat_tables/xlat_tables_common.c
Simple merge

diff --cc services/spd/tspd/tspd_common.c
Simple merge

diff --cc services/spd/tspd/tspd_main.c
index 02e1db747dbb9abaddb2cab24d38d6f41e6668e4,0bf03a48fb234f33570249c945199481a8dc0211..afa7e2ae2d20133b9e0ffcd249a678749191066f
--- 1/services/spd/tspd/tspd_main.c
--- 2/services/spd/tspd/tspd_main.c
+++ b/services/spd/tspd/tspd_main.c
@@@ -1,31 -1,7 +1,7 @@@
  /*
 - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
 + * Copyright (c) 2013-2017, ARM Limited and Contributors. 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-3-Clause
   */
  
  

diff --cc services/spd/tspd/tspd_private.h
index ebed7e50a34589865f07297026166dcb5098fb20,edcad2a0ea86c55181421238d1f5801b43b79fd9..8fadb7a5ac46e4b2993ac64d5b4d7c28f96f87fd
--- 1/services/spd/tspd/tspd_private.h
--- 2/services/spd/tspd/tspd_private.h
+++ b/services/spd/tspd/tspd_private.h
@@@ -1,31 -1,7 +1,7 @@@
  /*
 - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
 + * Copyright (c) 2013-2017, ARM Limited and Contributors. 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-3-Clause
   */
  
  #ifndef __TSPD_PRIVATE_H__