Enable third party contributions

- Add instructions for contributing to ARM Trusted Firmware.

- Update copyright text in all files to acknowledge contributors.

Change-Id: I9311aac81b00c6c167d2f8c889aea403b84450e5

diff --git a/Makefile b/Makefile
index c2b258fe5aa8941496d1642cd5f6cd823685023c..e1b0b8f0e8921f57cd598219b99d32c721f87c1e 100644 (file)
--- a/Makefile
+++ b/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:

diff --git a/acknowledgements.md b/acknowledgements.md
new file mode 100644 (file)
index 0000000..ef49ca3
--- /dev/null
+++ b/acknowledgements.md
@@ -0,0 +1,9 @@
+Contributor Acknowledgements
+============================
+
+Companies
+---------
+
+
+Individuals
+-----------

diff --git a/arch/aarch64/cpu/cpu_helpers.S b/arch/aarch64/cpu/cpu_helpers.S
index e7fc8f8474d5b1e214fd1deb786777906a41ed83..da63283291ca5b0a8b15d90f91ace629d85b70d8 100644 (file)
--- a/arch/aarch64/cpu/cpu_helpers.S
+++ b/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:

diff --git a/arch/system/gic/aarch64/gic_v3_sysregs.S b/arch/system/gic/aarch64/gic_v3_sysregs.S
index ecbc1f7f6fc2313f63e9d8c734de4007888daf5b..cb5dd79af4e62f439eee6dd9722080eaa002f9b9 100644 (file)
--- a/arch/system/gic/aarch64/gic_v3_sysregs.S
+++ b/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:

diff --git a/arch/system/gic/gic.h b/arch/system/gic/gic.h
index f38f42b3996d41084136abf113619f1ccebe5a7d..e4beb56a8779d66a9d38fb43f59bca61672afe1d 100644 (file)
--- a/arch/system/gic/gic.h
+++ b/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:

diff --git a/arch/system/gic/gic_v2.c b/arch/system/gic/gic_v2.c
index f8de290a1cf4760170e5a26077db021c28b202c7..6c928d55d039a0be4a6f67838966182e431e0509 100644 (file)
--- a/arch/system/gic/gic_v2.c
+++ b/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:

diff --git a/arch/system/gic/gic_v2.h b/arch/system/gic/gic_v2.h
index c944df6156f62f4c06066319ab1c68f65032b57f..284c874da915ae6ccd87fbc78c687ce30e765383 100644 (file)
--- a/arch/system/gic/gic_v2.h
+++ b/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:

diff --git a/arch/system/gic/gic_v3.h b/arch/system/gic/gic_v3.h
index a4fe2ce3cde82de6318341d317b63ba63a08dc3a..9777cf9e0b05fdddb63a1623f0029b84bac7aefe 100644 (file)
--- a/arch/system/gic/gic_v3.h
+++ b/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:

diff --git a/bl1/aarch64/bl1_arch_setup.c b/bl1/aarch64/bl1_arch_setup.c
index 7085f7789b47905733e20c37d2c4bee5eae72e4b..655f65de559999e30ec5eb3cb85e807a51e2942a 100644 (file)
--- a/bl1/aarch64/bl1_arch_setup.c
+++ b/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:

diff --git a/bl1/aarch64/bl1_entrypoint.S b/bl1/aarch64/bl1_entrypoint.S
index 119ae9369f57a8b3c85086d7526ff6ecfb155640..19b792c4f1b825f07e08d2d6ae889a662a843c04 100644 (file)
--- a/bl1/aarch64/bl1_entrypoint.S
+++ b/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:

diff --git a/bl1/aarch64/early_exceptions.S b/bl1/aarch64/early_exceptions.S
index 08a1122514859637c2b0a26bce903512d75ac083..12a36f33e6c462b7c508836ad60d60d6186d74d0 100644 (file)
--- a/bl1/aarch64/early_exceptions.S
+++ b/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:

diff --git a/bl1/bl1.ld.S b/bl1/bl1.ld.S
index b3f169f73a603518084c0a1bc23469f63923ee2a..3ca2b7104273d5cfab3f272ea065e1bf8786a3a9 100644 (file)
--- a/bl1/bl1.ld.S
+++ b/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:

diff --git a/bl1/bl1.mk b/bl1/bl1.mk
index b159fd9dde409480df76120b344df2e0494a7ce6..7623377718f697ea522573937d35b2a15047ec0e 100644 (file)
--- a/bl1/bl1.mk
+++ b/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:

diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c
index badda644958d4df93454ca4d217c74bdc2883b8f..ab9fa8cec89ab2d5e848c4d272008f6b75d98d02 100644 (file)
--- a/bl1/bl1_main.c
+++ b/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:

diff --git a/bl2/aarch64/bl2_arch_setup.c b/bl2/aarch64/bl2_arch_setup.c
index ed457ee9f34a55d2e5bf03f5b8aed20446760172..6283c1c05fcd1a4a41121347b94aa147df88d31b 100644 (file)
--- a/bl2/aarch64/bl2_arch_setup.c
+++ b/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:

diff --git a/bl2/aarch64/bl2_entrypoint.S b/bl2/aarch64/bl2_entrypoint.S
index 0255d65911b4fb8437305737536e1bc6d63fda05..75970f7457c8435ac6374f54cc54e5d41921954d 100644 (file)
--- a/bl2/aarch64/bl2_entrypoint.S
+++ b/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:

diff --git a/bl2/bl2.ld.S b/bl2/bl2.ld.S
index 7e9e5a5b748fbfc35646b8edc5582a426f6bcead..dee138c88db42d2d1f6bb4f42574c118176a3a8f 100644 (file)
--- a/bl2/bl2.ld.S
+++ b/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:

diff --git a/bl2/bl2.mk b/bl2/bl2.mk
index 212aa92f5f6c826d9ae1a9d0374bc26d13781729..f36b7bb9081427f3050c4d89660f81e57471bec3 100644 (file)
--- a/bl2/bl2.mk
+++ b/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:

diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index aae67b4ff34af35d3011d3b0cb5fc8ebb3861048..c738677caa5f8f51f4280fe73401271bb3c3f803 100644 (file)
--- a/bl2/bl2_main.c
+++ b/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:

diff --git a/bl31/aarch64/bl31_arch_setup.c b/bl31/aarch64/bl31_arch_setup.c
index 238af7bdfe8eba328ac8105b990ecd97d458260d..bbde03853a2407e07f4a9761164e926a805121e7 100644 (file)
--- a/bl31/aarch64/bl31_arch_setup.c
+++ b/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:

diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index 13725d7eb3519538820c222f6a41b3009c1bb922..593cc1d0708072502b56f717912895b4f270ec85 100644 (file)
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/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:

diff --git a/bl31/aarch64/exception_handlers.c b/bl31/aarch64/exception_handlers.c
index 860d8ebc8154c9cea6284e5d1724bab1a3df42d3..4cd3b2404d8ab495f1e74d73be02c810186f140a 100644 (file)
--- a/bl31/aarch64/exception_handlers.c
+++ b/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:

diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index 340024d11631ed5bcd5087666b81ac5983c1bbd3..6d086e005ca7dfab57343d6bee6613b3d45d0210 100644 (file)
--- a/bl31/aarch64/runtime_exceptions.S
+++ b/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:

diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S
index 72b97e54243dc96926af221cc25dd5f93fc9db2e..44ea620c8c929cc1c24ef4a6b4d59100bd28b279 100644 (file)
--- a/bl31/bl31.ld.S
+++ b/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:

diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index 401f26a307ce7cbe42e645f4cf48d68013e0d8f5..4e307e2e0b9068be482f1104374e12679455e62b 100644 (file)
--- a/bl31/bl31.mk
+++ b/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:

diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index e8fa2f8f43e5bcbc5c7a22b05ce6bf128495459f..e20bb7b79c6fa2cd6e4b5ea31c6d8dcba0d41c4d 100644 (file)
--- a/bl31/bl31_main.c
+++ b/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:

diff --git a/common/bl_common.c b/common/bl_common.c
index d125786989e712330b6ef165ecb9038fbd586a5c..8183337cdcf5ab7b7217be65dc17fbc85fa6da8b 100644 (file)
--- a/common/bl_common.c
+++ b/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:

diff --git a/common/psci/psci_afflvl_off.c b/common/psci/psci_afflvl_off.c
index 937ba9d1aa3ef90816eb2e80bdff3b435fd60e3d..fea2b7e8debfee9a2008a5a52026387076d4fb30 100644 (file)
--- a/common/psci/psci_afflvl_off.c
+++ b/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:

diff --git a/common/psci/psci_afflvl_on.c b/common/psci/psci_afflvl_on.c
index b0de0632a9fd6c2e822fb84476fee5cd5e19ebdb..7126b98db1ffeadf40afa861ad89fafeaca5e1f2 100644 (file)
--- a/common/psci/psci_afflvl_on.c
+++ b/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:

diff --git a/common/psci/psci_afflvl_suspend.c b/common/psci/psci_afflvl_suspend.c
index 9a2c0cfb45b1fdb31447e6be35b10ce5bfba434b..b68b4df75f43eb9773fed6c693acf0f3e124ad70 100644 (file)
--- a/common/psci/psci_afflvl_suspend.c
+++ b/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:

diff --git a/common/psci/psci_common.c b/common/psci/psci_common.c
index 6b07c530a24365dd5c62e13258510bb117a88330..59126baa6e6accb218b12f98f3e14c1140faaa63 100644 (file)
--- a/common/psci/psci_common.c
+++ b/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:

diff --git a/common/psci/psci_entry.S b/common/psci/psci_entry.S
index 014e4cf178df8b553e895f99c607c455c8872cf4..2f39f3602f6739a040f59065c7e6f84a0af9791e 100644 (file)
--- a/common/psci/psci_entry.S
+++ b/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:

diff --git a/common/psci/psci_main.c b/common/psci/psci_main.c
index eca2decea4689fbfe1b38bf34f6414d1bd6112d3..b1aa8997695a0a9ce0f099632feec9c91637c5b7 100644 (file)
--- a/common/psci/psci_main.c
+++ b/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:

diff --git a/common/psci/psci_private.h b/common/psci/psci_private.h
index 6505adf36cc9186f5129440b695482b5df01abba..4741397cf424d70a2a6b80b1daaf9f4888abfd22 100644 (file)
--- a/common/psci/psci_private.h
+++ b/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:

diff --git a/common/psci/psci_setup.c b/common/psci/psci_setup.c
index 9095e75d169151384061f04be6e0083cadb424be..8220b307f5cba2951c6c4c9ac7c3ed45a3bf5f60 100644 (file)
--- a/common/psci/psci_setup.c
+++ b/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:

diff --git a/common/runtime_svc.c b/common/runtime_svc.c
index ed1225f2bcecccf73befa453586a60a6f6a070ec..0aa4460f156bf4959206886f36e535088b59deec 100644 (file)
--- a/common/runtime_svc.c
+++ b/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:

diff --git a/contributing.md b/contributing.md
new file mode 100644 (file)
index 0000000..2f46d7e
--- /dev/null
+++ b/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

diff --git a/docs/change-log.md b/docs/change-log.md
index 963f57873f31449daaa622e133bbdc238f8a7524..841def96ad5241d5a2e3bfbc63e376ca381b0f0b 100644 (file)
--- a/docs/change-log.md
+++ b/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._

diff --git a/docs/porting-guide.md b/docs/porting-guide.md
index a3ef99e8af73318320166fa51c0382b8c3d62e37..0b071118554c0dc53144554480d8fa462c447a1d 100644 (file)
--- a/docs/porting-guide.md
+++ b/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

diff --git a/docs/user-guide.md b/docs/user-guide.md
index 8a5958297fd35893994469b54c5e574635de277f..476fc001150c6906d816dff81b5a4ddba9cd69e1 100644 (file)
--- a/docs/user-guide.md
+++ b/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

diff --git a/drivers/arm/interconnect/cci-400/cci400.c b/drivers/arm/interconnect/cci-400/cci400.c
index 60586ab21cc3671e7208b606750bc258a1057b04..55b4032a8daa609ed9a753bcf013094e439b45f7 100644 (file)
--- a/drivers/arm/interconnect/cci-400/cci400.c
+++ b/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:

diff --git a/drivers/arm/interconnect/cci-400/cci400.h b/drivers/arm/interconnect/cci-400/cci400.h
index 62e2fbb1623cdb37171288d2a54f2905f73a91b0..72e6f4e65221ad2e679dc7e5c4cd09b24c728dbc 100644 (file)
--- a/drivers/arm/interconnect/cci-400/cci400.h
+++ b/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:

diff --git a/drivers/arm/peripherals/pl011/console.h b/drivers/arm/peripherals/pl011/console.h
index b98db6120641ea2b49dbe93048f11321fb1af431..7747d4d0019cf80eb1497f15e80754b70a0ad4f6 100644 (file)
--- a/drivers/arm/peripherals/pl011/console.h
+++ b/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:

diff --git a/drivers/arm/peripherals/pl011/pl011.c b/drivers/arm/peripherals/pl011/pl011.c
index 2f6f5ea4c6af07fe0a9e7ca941d8fbda39ce23cc..cc18fc09526db9295d19d899508c9d4de0ee9fb4 100644 (file)
--- a/drivers/arm/peripherals/pl011/pl011.c
+++ b/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:

diff --git a/drivers/arm/peripherals/pl011/pl011.h b/drivers/arm/peripherals/pl011/pl011.h
index 53b4dab2969e340bfa3d4849c1df44ab3cd6fee7..0a30291941566471ac151328d3b07eb9134cc7f4 100644 (file)
--- a/drivers/arm/peripherals/pl011/pl011.h
+++ b/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:

diff --git a/drivers/power/fvp_pwrc.c b/drivers/power/fvp_pwrc.c
index c7db33be1d91cfd878c42d0241c50f13116b992d..2b98b054d2f6dcad730462900f344117e3b74e50 100644 (file)
--- a/drivers/power/fvp_pwrc.c
+++ b/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:

diff --git a/drivers/power/fvp_pwrc.h b/drivers/power/fvp_pwrc.h
index a2efcc5352b433096544289a7b0307a774c24a00..050c33b64ba60b4a5d2d1d1005de62abb6bd771d 100644 (file)
--- a/drivers/power/fvp_pwrc.h
+++ b/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:

diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts
index c8e8d13eeaf8d30bc25d2c2aca0ee8abe13dfe2f..646afb7de396435192de233c32b063e9163e5f5e 100644 (file)
--- a/fdts/fvp-base-gicv2-psci.dts
+++ b/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:

diff --git a/fdts/fvp-base-gicv2legacy-psci.dts b/fdts/fvp-base-gicv2legacy-psci.dts
index e53621e6c5067e797b75d74e03e755dd948a89bd..a5e0f492270cd9d0d3b69297815227e38891073d 100644 (file)
--- a/fdts/fvp-base-gicv2legacy-psci.dts
+++ b/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:

diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts
index c51a6724ed9b6391542ad9e68e97f27dc266c93a..4e95ee72bb7cecfbb9c45688b6bbd419cf44aa47 100644 (file)
--- a/fdts/fvp-base-gicv3-psci.dts
+++ b/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:

diff --git a/fdts/fvp-foundation-gicv2-psci.dts b/fdts/fvp-foundation-gicv2-psci.dts
index 7924ff2124da9b965c225008c21e7c6e25ef8f4f..983ae159e9436789a4b2075928e0662024a44ee7 100644 (file)
--- a/fdts/fvp-foundation-gicv2-psci.dts
+++ b/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:

diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dts b/fdts/fvp-foundation-gicv2legacy-psci.dts
index 656802eaa9b9bab395347b0507c73cc64ffa20c8..18b4f1e38dcd691596078701e81715907e05d374 100644 (file)
--- a/fdts/fvp-foundation-gicv2legacy-psci.dts
+++ b/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:

diff --git a/fdts/fvp-foundation-gicv3-psci.dts b/fdts/fvp-foundation-gicv3-psci.dts
index 87ee3c01619fa57089ebc9877a593fc4edce162c..bbe1e07b360cf2bfb1a75ce71c071d613552ecca 100644 (file)
--- a/fdts/fvp-foundation-gicv3-psci.dts
+++ b/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:

diff --git a/fdts/fvp-foundation-motherboard.dtsi b/fdts/fvp-foundation-motherboard.dtsi
index 76cae31f4f85943443f17e9cd1285a3f6e4556c8..cac7aa2782af4d75bf8645291f0701271716a889 100644 (file)
--- a/fdts/fvp-foundation-motherboard.dtsi
+++ b/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:

diff --git a/fdts/rtsm_ve-motherboard.dtsi b/fdts/rtsm_ve-motherboard.dtsi
index 00e92c5b521216172838ebfebf52d976a5cbba82..3f429da3259979f0d409cf49805ef530f8c5cb1c 100644 (file)
--- a/fdts/rtsm_ve-motherboard.dtsi
+++ b/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:

diff --git a/include/aarch64/arch.h b/include/aarch64/arch.h
index 055a745430d9fc306d1855b218a47a136e5a9138..143dc6c58f3953574c83055500be4373bc1a71d0 100644 (file)
--- a/include/aarch64/arch.h
+++ b/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:

diff --git a/include/aarch64/arch_helpers.h b/include/aarch64/arch_helpers.h
index 9dc6b924cecf1de226db9831b9bdd9b1104b917b..85c04812460ee51c81cf4494e82b285f0844eb0b 100644 (file)
--- a/include/aarch64/arch_helpers.h
+++ b/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:

diff --git a/include/asm_macros.S b/include/asm_macros.S
index f7afdfcf5e9ebd8750c93247ee7e7b126b6eb6e7..0067ca610398a85ed1d814f18973bfa4527bb405 100644 (file)
--- a/include/asm_macros.S
+++ b/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:

diff --git a/include/bakery_lock.h b/include/bakery_lock.h
index 6c4ab8fdde9fb66e46681f5d93d6a6704d931c81..76ef6d9151cef4b638618f655473696701137ca8 100644 (file)
--- a/include/bakery_lock.h
+++ b/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:

diff --git a/include/bl1.h b/include/bl1.h
index 868ee4f4c1b8ad8a8d32dbcf3cdf587ac22e83b0..81b5bc49192766f283dd95089b9e855394b36745 100644 (file)
--- a/include/bl1.h
+++ b/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:

diff --git a/include/bl2.h b/include/bl2.h
index 6fa8721fafa12af8a32245f448fbb88bad4fcbed..3981a860a82cf4398e92661e6e23432388386525 100644 (file)
--- a/include/bl2.h
+++ b/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:

diff --git a/include/bl31.h b/include/bl31.h
index 0d123a4bd88c7a525bc4ea065097e122414c2684..dbf7e5ab9168b6b521dea23f35c3b0bf14ed9558 100644 (file)
--- a/include/bl31.h
+++ b/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:

diff --git a/include/bl_common.h b/include/bl_common.h
index 58accdb1c4d613285e9250083d98cda1c0069de4..3504d0410e2c30455d62c6bebf5f05046d37c7ae 100644 (file)
--- a/include/bl_common.h
+++ b/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:

diff --git a/include/mmio.h b/include/mmio.h
index ecc1f878d35691835cc7e1f26214f89592f192dc..53f7e31d6962097fc83f09b163afe7180e7fd71d 100644 (file)
--- a/include/mmio.h
+++ b/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:

diff --git a/include/pm.h b/include/pm.h
index 7a4ef8b50c6d320cf5dad0f8523eb53e1dfa1fac..24e080baa7bd37735293311b04c9fb49c48646cb 100644 (file)
--- a/include/pm.h
+++ b/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:

diff --git a/include/psci.h b/include/psci.h
index f63e32cc56fd1cc2d99f5ccd98b1f81a9546e10c..e5eb9971be937b80b4919cc815824547005bf310 100644 (file)
--- a/include/psci.h
+++ b/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:

diff --git a/include/runtime_svc.h b/include/runtime_svc.h
index ea6accbd83a79039e25f00b4f4a8b9bedf4848e4..3ccbe88117b69db86279c8ad4c90ed7fe6c2bf56 100644 (file)
--- a/include/runtime_svc.h
+++ b/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:

diff --git a/include/semihosting.h b/include/semihosting.h
index b56ff2fb6269e388e6c35375801e0bc3093cec4d..b7fbddbf182ccbf19f70a6cedeffcf63d7df16e1 100644 (file)
--- a/include/semihosting.h
+++ b/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:

diff --git a/include/spinlock.h b/include/spinlock.h
index 9cc261ff817f2942712b9cea2b107a46a1ff2d5a..7436664c3d9794b4f5d7dff003ed2a80dbe44864 100644 (file)
--- a/include/spinlock.h
+++ b/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:

diff --git a/lib/arch/aarch64/cache_helpers.S b/lib/arch/aarch64/cache_helpers.S
index b8a560831a2611b62b339faa5cf0e2173ec59ea4..d54ecbc0f59940436e9d6fcde52aa4b0fe4a1496 100644 (file)
--- a/lib/arch/aarch64/cache_helpers.S
+++ b/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:

diff --git a/lib/arch/aarch64/misc_helpers.S b/lib/arch/aarch64/misc_helpers.S
index e36fdfa84926af89e097faeb53faf5f1c062e02c..08a568ef08614e46feff83afd082f99b2029ac5a 100644 (file)
--- a/lib/arch/aarch64/misc_helpers.S
+++ b/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:

diff --git a/lib/arch/aarch64/sysreg_helpers.S b/lib/arch/aarch64/sysreg_helpers.S
index e68192ffdfd91dd59fcbad665116877335524711..c53f9522258e1cb9779d468c62267dd30b3e8e89 100644 (file)
--- a/lib/arch/aarch64/sysreg_helpers.S
+++ b/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:

diff --git a/lib/arch/aarch64/tlb_helpers.S b/lib/arch/aarch64/tlb_helpers.S
index eef7546c5292a636efda07a7dfb472b1664facb8..1706cd2f1f1e8baaa3ef57972062e613f8edff29 100644 (file)
--- a/lib/arch/aarch64/tlb_helpers.S
+++ b/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:

diff --git a/lib/mmio.c b/lib/mmio.c
index bf35e368beaed9638bfae9befae7eb797a319e57..802b1effc3e8231e76c6f40ad6ce9a8462b4cf6e 100644 (file)
--- a/lib/mmio.c
+++ b/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:

diff --git a/lib/non-semihosting/ctype.h b/lib/non-semihosting/ctype.h
index 88e7da1f1bb7d011d310b0d4e6a1744ac34bba63..52870b489df2e18f9ea226c2ab11754bf20d56ff 100644 (file)
--- a/lib/non-semihosting/ctype.h
+++ b/lib/non-semihosting/ctype.h
@@ -35,9 +35,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: include/lib/ctype.h
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #ifndef _SYS_CTYPE_H_

diff --git a/lib/non-semihosting/mem.c b/lib/non-semihosting/mem.c
index bca9ab5c6706330be9b0bd25a3de080a39989d01..e072710be6c692b0046609490475ff5d6c73cdb1 100644 (file)
--- a/lib/non-semihosting/mem.c
+++ b/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:

diff --git a/lib/non-semihosting/std.c b/lib/non-semihosting/std.c
index ea91d5f69f867debb48498634969492e28960ec7..1c1c807872cf69725ab8e6a2f026b9baeb7dd7df 100644 (file)
--- a/lib/non-semihosting/std.c
+++ b/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:

diff --git a/lib/non-semihosting/strcmp.c b/lib/non-semihosting/strcmp.c
index e5921ba2495cbe019831a9e2c0c16763a23ed164..21c248e6719767bb3fedde1d482c2b08995f4ba0 100644 (file)
--- a/lib/non-semihosting/strcmp.c
+++ b/lib/non-semihosting/strcmp.c
@@ -31,9 +31,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strcmp.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 /*

diff --git a/lib/non-semihosting/string.c b/lib/non-semihosting/string.c
index 5bb01a1dfd2fb703357fddfe04dea698f8f11e6d..01ffdc73ee166bb8b55cb56eefb5c66b4575a16a 100644 (file)
--- a/lib/non-semihosting/string.c
+++ b/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:

diff --git a/lib/non-semihosting/strlen.c b/lib/non-semihosting/strlen.c
index 5c1e7a6dd724dda0795550a26d73001fcdbcb11f..a388fe437e0a0b71894e793a99b04adba7928ab4 100644 (file)
--- a/lib/non-semihosting/strlen.c
+++ b/lib/non-semihosting/strlen.c
@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strlen.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include <stddef.h>

diff --git a/lib/non-semihosting/strncmp.c b/lib/non-semihosting/strncmp.c
index 984b7a061287f6a6babe14df7b7947b6cad7390e..beb90ec8885de52ef3fff077c2444cfacb9c91c8 100644 (file)
--- a/lib/non-semihosting/strncmp.c
+++ b/lib/non-semihosting/strncmp.c
@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strncmp.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"

diff --git a/lib/non-semihosting/strncpy.c b/lib/non-semihosting/strncpy.c
index 56a8a698a383df82c3485009797aeeda14f1449f..31a4332e84fe70d541474f60af363c264661f18f 100644 (file)
--- a/lib/non-semihosting/strncpy.c
+++ b/lib/non-semihosting/strncpy.c
@@ -31,9 +31,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strncpy.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"

diff --git a/lib/non-semihosting/strsep.c b/lib/non-semihosting/strsep.c
index 1f80af4059ff9aa8ab33228a322748fd437b2620..555a4788c4fdfaedca941797558966961b9ecb37 100644 (file)
--- a/lib/non-semihosting/strsep.c
+++ b/lib/non-semihosting/strsep.c
@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strsep.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"

diff --git a/lib/non-semihosting/strtol.c b/lib/non-semihosting/strtol.c
index 4a5a40477a692a18304ece1ef7dc0af819bd72b8..f743c4165cd071a810024a317bf7a625f4f3869e 100644 (file)
--- a/lib/non-semihosting/strtol.c
+++ b/lib/non-semihosting/strtol.c
@@ -33,9 +33,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strtol.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"

diff --git a/lib/non-semihosting/strtoull.c b/lib/non-semihosting/strtoull.c
index e46ef4ce44d6c246d6a2e1db1cfe1fa95a8a2c5e..61b41f33e53c04e1d5e79768773e3503181c5d11 100644 (file)
--- a/lib/non-semihosting/strtoull.c
+++ b/lib/non-semihosting/strtoull.c
@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strtoull.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"

diff --git a/lib/non-semihosting/subr_prf.c b/lib/non-semihosting/subr_prf.c
index 6e2a1aceffcf44bdcef3db9c4d3c621760a1c730..0056c81d24633af4e06e91693c1fc0ba182a3f1f 100644 (file)
--- a/lib/non-semihosting/subr_prf.c
+++ b/lib/non-semihosting/subr_prf.c
@@ -35,9 +35,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/subr_prf.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 /*

diff --git a/lib/semihosting/aarch64/semihosting_call.S b/lib/semihosting/aarch64/semihosting_call.S
index cc72ec2145d9a434e479715feebc5e36a4934692..f20672306ecd27956e3aff9d16944d9cad450851 100644 (file)
--- a/lib/semihosting/aarch64/semihosting_call.S
+++ b/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:

diff --git a/lib/semihosting/semihosting.c b/lib/semihosting/semihosting.c
index 558973ac89ce5df9b4cd77bfc100c2529aca21e1..528db17feec8191fb6a45607159fcd6e92126cf2 100644 (file)
--- a/lib/semihosting/semihosting.c
+++ b/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:

diff --git a/lib/sync/locks/bakery/bakery_lock.c b/lib/sync/locks/bakery/bakery_lock.c
index d3c780cbb28c7791525ce7a769e5d4904c19869a..dab4a7587bb8bc9ef78e983e76957e18181b48b0 100644 (file)
--- a/lib/sync/locks/bakery/bakery_lock.c
+++ b/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:

diff --git a/lib/sync/locks/exclusive/spinlock.S b/lib/sync/locks/exclusive/spinlock.S
index 4269d95a19a17ded55bb5e4d4134ef720ade7faf..aedc312c919cad7524d28f442e3a83d71eaaf380 100644 (file)
--- a/lib/sync/locks/exclusive/spinlock.S
+++ b/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:

diff --git a/license.md b/license.md
index 7652f10e20254ecf76d37429c60e7fa8900a0845..e792455224766b2e82074074bbd9a1b119543618 100644 (file)
--- a/license.md
+++ b/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:

diff --git a/plat/common/aarch64/platform_helpers.S b/plat/common/aarch64/platform_helpers.S
index c574eb9d7f562e780d737f2f12d5cd768f07c81a..8a6f49316076132ee79e832f8a2322e7ea2426b3 100644 (file)
--- a/plat/common/aarch64/platform_helpers.S
+++ b/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:

diff --git a/plat/fvp/aarch64/bl1_plat_helpers.S b/plat/fvp/aarch64/bl1_plat_helpers.S
index 0adb54150f58cee47b8a4dcadb54dc3d32495a9a..2b9903bc6c826dadc9b1722a64ee00f8a5ce1b8c 100644 (file)
--- a/plat/fvp/aarch64/bl1_plat_helpers.S
+++ b/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:

diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/fvp_common.c
index fd0e0737078809f7dd4cb7a2d5a2b3c4e9072ac5..1f4d784683c7e87e27fca8208dddd2889bdabb53 100644 (file)
--- a/plat/fvp/aarch64/fvp_common.c
+++ b/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:

diff --git a/plat/fvp/aarch64/fvp_helpers.S b/plat/fvp/aarch64/fvp_helpers.S
index 7a893d084bf7d1914ce77fd75925c8cce8d0a12d..e7e844a225c548d91f4c49a74be12303dce4464a 100644 (file)
--- a/plat/fvp/aarch64/fvp_helpers.S
+++ b/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:

diff --git a/plat/fvp/bl1_plat_setup.c b/plat/fvp/bl1_plat_setup.c
index 822a100d0d275a6f321977c613687f8534e68623..9d19bb8ef7e3ea2d6fc1cf28a3d2969cc3308f7f 100644 (file)
--- a/plat/fvp/bl1_plat_setup.c
+++ b/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:

diff --git a/plat/fvp/bl2_plat_setup.c b/plat/fvp/bl2_plat_setup.c
index bb3b45a01e395c3b83719481d5c75b6ef526f8fd..7212df1288f1a9ae1ed7525753e1265f77058d45 100644 (file)
--- a/plat/fvp/bl2_plat_setup.c
+++ b/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:

diff --git a/plat/fvp/bl31_plat_setup.c b/plat/fvp/bl31_plat_setup.c
index 47b6d5bd542358e36301811a6122312702244404..ab8e3780e810871e2ca684f78e7d360962742a25 100644 (file)
--- a/plat/fvp/bl31_plat_setup.c
+++ b/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:

diff --git a/plat/fvp/fvp_pm.c b/plat/fvp/fvp_pm.c
index af8d1b332643aea84d91c1f414ca05bb7a6beda2..fd92526d5bc7562922450057794f157b4626fdfd 100644 (file)
--- a/plat/fvp/fvp_pm.c
+++ b/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:

diff --git a/plat/fvp/fvp_topology.c b/plat/fvp/fvp_topology.c
index 20f3324755e7d0bda2c0f2c9b36e75489b871ce3..53d45e4623b14640f74e224156cc1728bac81d39 100644 (file)
--- a/plat/fvp/fvp_topology.c
+++ b/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:

diff --git a/plat/fvp/platform.h b/plat/fvp/platform.h
index 463c637b730ccfa9d1dfb439babeb6bf67205b62..399a772a3ec017ec99fd6b9f1d6ddbb1305529d1 100644 (file)
--- a/plat/fvp/platform.h
+++ b/plat/fvp/platform.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:

diff --git a/readme.md b/readme.md
index 38ac095cb3369142d6adef695ae6326c6cb72f07..306e71a60ae56b62ac154b1ff76757e51dfd55f2 100644 (file)
--- a/readme.md
+++ b/readme.md
@@ -100,6 +100,10 @@ the Trusted Firmware with the ARM [FVP]s.
 See the [Porting Guide] as well for information about how to use this
 software on another ARMv8-A platform.
 
+See the [Contributing Guidelines] for information on how to contribute to this
+project and the [Acknowledgements] file for a list of contributors to the
+project.
+
 ### Feedback and support
 
 ARM welcomes any feedback on the Trusted Firmware. Please send feedback using
@@ -111,13 +115,15 @@ ARM licensees may contact ARM directly via their partner managers.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-_Copyright (c) 2013 ARM Ltd. All rights reserved._
+_Copyright (c) 2013, ARM Limited and Contributors. All rights reserved._
 
 
-[License]:       license.md "BSD license for ARM Trusted Firmware"
-[Change Log]:    ./docs/change-log.md
-[User Guide]:    ./docs/user-guide.md
-[Porting Guide]: ./docs/porting-guide.md
+[License]:                  ./license.md "BSD license for ARM Trusted Firmware"
+[Contributing Guidelines]:  ./contributing.md "Guidelines for contributors"
+[Acknowledgements]:         ./acknowledgements.md "Contributor acknowledgements"
+[Change Log]:               ./docs/change-log.md
+[User Guide]:               ./docs/user-guide.md
+[Porting Guide]:            ./docs/porting-guide.md
 
 [ARMv8-A]:       http://www.arm.com/products/processors/armv8-architecture.php "ARMv8-A Architecture"
 [FVP]:           http://www.arm.com/fvp "ARM's Fixed Virtual Platforms"