Merge pull request #927 from jeenu-arm/state-switch

Execution state switch

diff --cc bl1/aarch64/bl1_context_mgmt.c
index 7069ed6481d4d04ad33eee255f2fc696f3e9bba5,d226f61a0e8266563a7c9830369e33472c683b50..2c7fe0705ffa0f7fc5c7d65cfb8285fef0673c75
--- 1/bl1/aarch64/bl1_context_mgmt.c
--- 2/bl1/aarch64/bl1_context_mgmt.c
+++ b/bl1/aarch64/bl1_context_mgmt.c
@@@ -1,7 -1,31 +1,7 @@@
  /*
-  * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
+  * Copyright (c) 2015-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 bl31/bl31_main.c
Simple merge

diff --cc include/lib/aarch64/arch.h
Simple merge

diff --cc include/lib/aarch64/arch_helpers.h
Simple merge

diff --cc include/lib/el3_runtime/context_mgmt.h
Simple merge

diff --cc include/lib/psci/psci_lib.h
Simple merge

diff --cc include/plat/arm/common/arm_sip_svc.h
index bbfd4daf85a815673659faa13095187f5bd83c6b,f3eac31854d93cacb2051904a5b2c0c124bb0626..68375afaedf37957378e34f977e44f26e620ce4b
--- 1/include/plat/arm/common/arm_sip_svc.h
--- 2/include/plat/arm/common/arm_sip_svc.h
+++ b/include/plat/arm/common/arm_sip_svc.h
@@@ -1,7 -1,31 +1,7 @@@
  /*
-  * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+  * Copyright (c) 2016-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 __ARM_SIP_SVC_H__

diff --cc include/plat/arm/common/plat_arm.h
Simple merge

diff --cc lib/el3_runtime/aarch64/context_mgmt.c
Simple merge

diff --cc lib/psci/psci_common.c
Simple merge

diff --cc plat/arm/common/arm_common.c
Simple merge

diff --cc plat/arm/common/arm_common.mk
Simple merge

diff --cc plat/arm/common/arm_sip_svc.c
index 90997e32148057ec2532cff3d7494852850ec376,62a2ef55ecb7a657667cc50a8f3fb836f983f50b..7fe61019e28c1e92e76be811dfcfe0953c2de6ae
--- 1/plat/arm/common/arm_sip_svc.c
--- 2/plat/arm/common/arm_sip_svc.c
+++ b/plat/arm/common/arm_sip_svc.c
@@@ -1,7 -1,31 +1,7 @@@
  /*
-  * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+  * Copyright (c) 2016-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 <arm_sip_svc.h>

diff --cc plat/mediatek/mt6795/bl31_plat_setup.c
index 2a4a7ed7c528acef9123e2dee4ffe36557223b3a,1ba8b1450ec04ecc669f456008b7810e24da3df9..a70d10311331e7c9be06e059d52678773aec5c42
--- 1/plat/mediatek/mt6795/bl31_plat_setup.c
--- 2/plat/mediatek/mt6795/bl31_plat_setup.c
+++ b/plat/mediatek/mt6795/bl31_plat_setup.c
@@@ -1,7 -1,31 +1,7 @@@
  /*
-  * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+  * Copyright (c) 2016-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 <arm_gic.h>
  #include <assert.h>

diff --cc plat/qemu/qemu_bl2_setup.c
Simple merge