Enable third party contributions

- Add instructions for contributing to ARM Trusted Firmware.

- Update copyright text in all files to acknowledge contributors.

Change-Id: I9311aac81b00c6c167d2f8c889aea403b84450e5

Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, ARM Limited. All rights reserved.
+# Copyright (c) 2013, 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:

acknowledgements.md

@@ -0,0 +1,9 @@
+Contributor Acknowledgements
+============================
+
+Companies
+---------
+
+
+Individuals
+-----------

arch/aarch64/cpu/cpu_helpers.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

arch/system/gic/aarch64/gic_v3_sysregs.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

arch/system/gic/gic.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

arch/system/gic/gic_v2.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

arch/system/gic/gic_v2.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

arch/system/gic/gic_v3.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl1/aarch64/bl1_arch_setup.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl1/aarch64/bl1_entrypoint.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl1/aarch64/early_exceptions.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl1/bl1.ld.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl1/bl1.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, ARM Limited. All rights reserved.
+# Copyright (c) 2013, 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:

bl1/bl1_main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl2/aarch64/bl2_arch_setup.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl2/aarch64/bl2_entrypoint.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl2/bl2.ld.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl2/bl2.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, ARM Limited. All rights reserved.
+# Copyright (c) 2013, 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:

bl2/bl2_main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl31/aarch64/bl31_arch_setup.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl31/aarch64/bl31_entrypoint.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl31/aarch64/exception_handlers.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl31/aarch64/runtime_exceptions.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl31/bl31.ld.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

bl31/bl31.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, ARM Limited. All rights reserved.
+# Copyright (c) 2013, 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:

bl31/bl31_main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/bl_common.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/psci/psci_afflvl_off.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/psci/psci_afflvl_on.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/psci/psci_afflvl_suspend.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/psci/psci_common.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/psci/psci_entry.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/psci/psci_main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/psci/psci_private.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/psci/psci_setup.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

common/runtime_svc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

contributing.md

@@ -0,0 +1,114 @@
+Contributing to ARM Trusted Firmware
+====================================
+
+Before you start contributing to this project you must sign the ARM
+Contributor License Agreement (CLA).
+
+Individuals who want to contribute their own work must sign and return an
+Individual CLA. Companies that want to contribute must sign and return a
+Corporate CLA if their employees' intellectual property has been assigned to
+the employer. Copies of the CLAs are available on request from
+[cla-submissions@arm.com]. They will be available from http://www.arm.com in
+due course.
+
+For this project, ARM also requires the GitHub account name(s) associated with
+each individual contributor or the designated employees of corporate
+contributors. Only contributions originating from these accounts will be
+considered covered by the CLA. To avoid delay, you should provide the Github
+account name(s) at the same time as the signed CLA.
+
+ARM reserves the right to not accept a contribution. This may be for technical,
+commercial or legal reasons.
+
+
+Getting Started
+---------------
+
+*   Make sure you have a [GitHub account].
+*   Create an [issue] for your work if one does not already exist. This gives
+    everyone visibility of whether others are working on something similar. ARM
+    licensees may contact ARM directly via their partner managers instead if
+    they prefer.
+    *   For bugs, use the "bug" label in the [issue] and clearly describe the
+        problem, including steps to reproduce.
+    *   For enhancements, use the "enhancement" label and clearly describe
+        how you intend to implement the change.
+        If you intend to include Third Party IP in your contribution, please
+        raise a separate [issue] for this and ensure that the changes that
+        include Third Party IP are made on a separate topic branch.
+*   [Fork][] [arm-trusted-firmware][] on GitHub.
+*   Clone the fork to your own machine.
+*   Create a local topic branch based on the [arm-trusted-firmware][] `master`
+    branch.
+
+
+Making Changes
+--------------
+
+*   Make commits of logical units. See these general [Git guidelines] for
+    contributing to a project.
+*   Follow the [Linux coding style]; this style is re-used for the ARM Trusted
+    Firmware project.
+*   Keep the commits on topic. If you need to fix another bug or make another
+    enhancement, please create a separate [issue] and address it on a separate
+    topic branch.
+*   Avoid long commit series. If you do have a long series, consider whether
+    some commits should be squashed together or addressed in a separate topic.
+*   Make sure your commit messages are in the proper format. If a commit fixes
+    a GitHub [issue], include a reference (e.g. "fixes #45"); this ensures
+    the [issue] is [automatically closed] when merged into the
+    [arm-trusted-firmware] `master` branch.
+*   Where appropriate, please update the documentation.
+    *   Consider whether the [User Guide] or [Porting Guide] need updating.
+    *   Changes that have a material impact on behavior or programming
+        interfaces should have an entry at the end of the "[Detailed changes
+        since last release]" section of the [Change Log]. Minor changes (e.g.
+        basic refactoring or typo fixes) do not need an entry.
+    *   If this is your first contribution, you may add your name or your
+        company name to the [Acknowledgements] file.
+    *   For topics with multiple commits, you should make all documentation
+        changes (and nothing else) in the last commit of the series. Otherwise,
+        include the documentation changes within the single commit.
+*   Please test your changes. As a minimum, ensure UEFI boots to the shell on
+    the Foundation FVP. See the "[Running the software]" section of the
+    [User Guide] for more information.
+
+
+Submitting Changes
+------------------
+
+*   Ensure we have your signed CLA.
+*   Push your local changes to your fork of the repository.
+*   Submit a [pull request] to arm-trusted-firmware.
+    *   The changes in the pull request will then undergo further review and
+        testing. Any review comments will be made as comments on the [pull
+        request]. This may require you to do some rework.
+*   When the changes are accepted, ARM will integrate them.
+    *   To ensure a linear commit history, ARM will typically rebase the commits
+        locally before merging to the [arm-trusted-firmware] `master` branch. In
+        this case, the [pull request] will be closed rather than directly merged
+        on GitHub. If the rebase is not trivial, you may be asked to rebase the
+        commits yourself.
+
+
+- - - - - - - - - - - - - - - - - - - - - - - - - -
+
+_Copyright (c) 2013, ARM Limited and Contributors. All rights reserved._
+
+
+[Change Log]:                           ./docs/change-log.md
+[Detailed changes since last release]:  ./docs/change-log.md#detailed-changes-since-last-release
+[User Guide]:                           ./docs/user-guide.md
+[Running the software]:                 ./docs/user-guide.md#running-the-software
+[Porting Guide]:                        ./docs/porting-guide.md
+[Acknowledgements]:                     ./acknowledgements.md "Contributor acknowledgements"
+
+[cla-submissions@arm.com]: mailto:cla-submissions@arm.com
+[GitHub account]:          http://github.com/signup/free
+[Fork]:                    http://help.github.com/articles/fork-a-repo
+[issue]:                   http://github.com/ARM-software/arm-trusted-firmware/issues
+[pull request]:            http://help.github.com/articles/using-pull-requests
+[automatically closed]:    https://help.github.com/articles/closing-issues-via-commit-messages
+[Git guidelines]:          http://git-scm.com/book/ch5-2.html
+[Linux coding style]:      https://www.kernel.org/doc/Documentation/CodingStyle
+[arm-trusted-firmware]:    https://github.com/ARM-software/arm-trusted-firmware

docs/change-log.md

@@ -41,6 +41,11 @@ Detailed changes since last release
     them have been merged together, and some alignment constraints on sections
     have changed.
 
+*   Enable third party contributions. Add a new contributing.md containing
+    instructions for how to contribute and update copyright text in all files to
+    acknowledge contributors.
+
+
 ARM Trusted Firmware - version 0.2
 ==================================
 
@@ -112,8 +117,8 @@ releases of the ARM Trusted Firmware.
 Detailed changes since last release
 -----------------------------------
 
-First source release – not applicable.
+First source release - not applicable.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-_Copyright (c) 2013 ARM Ltd. All rights reserved._
+_Copyright (c) 2013, ARM Limited and Contributors. All rights reserved._

docs/porting-guide.md

@@ -928,7 +928,7 @@ provided in the description of the `plat_get_aff_count()` and
 
 - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-_Copyright (c) 2013 ARM Ltd. All rights reserved._
+_Copyright (c) 2013, ARM Limited and Contributors. All rights reserved._
 
 
 [User Guide]: user-guide.md

docs/user-guide.md

@@ -1204,7 +1204,7 @@ kernel at boot time. These can be found in the `fdts` directory.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-_Copyright (c) 2013 ARM Ltd. All rights reserved._
+_Copyright (c) 2013, ARM Limited and Contributors. All rights reserved._
 
 
 [Change Log]: change-log.md

drivers/arm/interconnect/cci-400/cci400.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

drivers/arm/interconnect/cci-400/cci400.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

drivers/arm/peripherals/pl011/console.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

drivers/arm/peripherals/pl011/pl011.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

drivers/arm/peripherals/pl011/pl011.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

drivers/power/fvp_pwrc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

drivers/power/fvp_pwrc.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

fdts/fvp-base-gicv2-psci.dts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

fdts/fvp-base-gicv2legacy-psci.dts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

fdts/fvp-base-gicv3-psci.dts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

fdts/fvp-foundation-gicv2-psci.dts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

fdts/fvp-foundation-gicv2legacy-psci.dts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

fdts/fvp-foundation-gicv3-psci.dts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

fdts/fvp-foundation-motherboard.dtsi

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

fdts/rtsm_ve-motherboard.dtsi

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/aarch64/arch.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/aarch64/arch_helpers.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/asm_macros.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/bakery_lock.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/bl1.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/bl2.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/bl31.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/bl_common.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/mmio.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/pm.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/psci.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/runtime_svc.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/semihosting.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

include/spinlock.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/arch/aarch64/cache_helpers.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/arch/aarch64/misc_helpers.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/arch/aarch64/sysreg_helpers.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/arch/aarch64/tlb_helpers.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/mmio.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/non-semihosting/ctype.h

@@ -35,9 +35,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: include/lib/ctype.h
  */
 
 #ifndef _SYS_CTYPE_H_

lib/non-semihosting/mem.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/non-semihosting/std.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/non-semihosting/strcmp.c

@@ -31,9 +31,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strcmp.c
  */
 
 /*

lib/non-semihosting/string.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/non-semihosting/strlen.c

@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strlen.c
  */
 
 #include <stddef.h>

lib/non-semihosting/strncmp.c

@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strncmp.c
  */
 
 #include "types.h"

lib/non-semihosting/strncpy.c

@@ -31,9 +31,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strncpy.c
  */
 
 #include "types.h"

lib/non-semihosting/strsep.c

@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strsep.c
  */
 
 #include "types.h"

lib/non-semihosting/strtol.c

@@ -33,9 +33,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strtol.c
  */
 
 #include "types.h"

lib/non-semihosting/strtoull.c

@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strtoull.c
  */
 
 #include "types.h"

lib/non-semihosting/subr_prf.c

@@ -35,9 +35,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/subr_prf.c
  */
 
 /*

lib/semihosting/aarch64/semihosting_call.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/semihosting/semihosting.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/sync/locks/bakery/bakery_lock.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

lib/sync/locks/exclusive/spinlock.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

license.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013, ARM Limited. All rights reserved.
+Copyright (c) 2013, 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:

plat/common/aarch64/platform_helpers.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

plat/fvp/aarch64/bl1_plat_helpers.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

plat/fvp/aarch64/fvp_common.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

plat/fvp/aarch64/fvp_helpers.S

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

plat/fvp/bl1_plat_setup.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

plat/fvp/bl2_plat_setup.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

plat/fvp/bl31_plat_setup.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

plat/fvp/fvp_pm.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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:

plat/fvp/fvp_topology.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, 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: