diff --git a/Makefile b/Makefile index c2b258fe5..e1b0b8f0e 100644 --- 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 index 000000000..ef49ca336 --- /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 e7fc8f847..da6328329 100644 --- 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 ecbc1f7f6..cb5dd79af 100644 --- 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 f38f42b39..e4beb56a8 100644 --- 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 f8de290a1..6c928d55d 100644 --- 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 c944df615..284c874da 100644 --- 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 a4fe2ce3c..9777cf9e0 100644 --- 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 7085f7789..655f65de5 100644 --- 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 119ae9369..19b792c4f 100644 --- 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 08a112251..12a36f33e 100644 --- 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 b3f169f73..3ca2b7104 100644 --- 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 b159fd9dd..762337771 100644 --- 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 badda6449..ab9fa8cec 100644 --- 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 ed457ee9f..6283c1c05 100644 --- 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 0255d6591..75970f745 100644 --- 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 7e9e5a5b7..dee138c88 100644 --- 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 212aa92f5..f36b7bb90 100644 --- 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 aae67b4ff..c738677ca 100644 --- 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 238af7bdf..bbde03853 100644 --- 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 13725d7eb..593cc1d07 100644 --- 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 860d8ebc8..4cd3b2404 100644 --- 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 340024d11..6d086e005 100644 --- 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 72b97e542..44ea620c8 100644 --- 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 401f26a30..4e307e2e0 100644 --- 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 e8fa2f8f4..e20bb7b79 100644 --- 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 d12578698..8183337cd 100644 --- 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 937ba9d1a..fea2b7e8d 100644 --- 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 b0de0632a..7126b98db 100644 --- 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 9a2c0cfb4..b68b4df75 100644 --- 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 6b07c530a..59126baa6 100644 --- 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 014e4cf17..2f39f3602 100644 --- 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 eca2decea..b1aa89976 100644 --- 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 6505adf36..4741397cf 100644 --- 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 9095e75d1..8220b307f 100644 --- 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 ed1225f2b..0aa4460f1 100644 --- 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 index 000000000..2f46d7ead --- /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 963f57873..841def96a 100644 --- 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 a3ef99e8a..0b0711185 100644 --- 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 8a5958297..476fc0011 100644 --- 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 60586ab21..55b4032a8 100644 --- 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 62e2fbb16..72e6f4e65 100644 --- 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 b98db6120..7747d4d00 100644 --- 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 2f6f5ea4c..cc18fc095 100644 --- 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 53b4dab29..0a3029194 100644 --- 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 c7db33be1..2b98b054d 100644 --- 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 a2efcc535..050c33b64 100644 --- 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 c8e8d13ee..646afb7de 100644 --- 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 e53621e6c..a5e0f4922 100644 --- 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 c51a6724e..4e95ee72b 100644 --- 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 7924ff212..983ae159e 100644 --- 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 656802eaa..18b4f1e38 100644 --- 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 87ee3c016..bbe1e07b3 100644 --- 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 76cae31f4..cac7aa278 100644 --- 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 00e92c5b5..3f429da32 100644 --- 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 055a74543..143dc6c58 100644 --- 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 9dc6b924c..85c048124 100644 --- 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 f7afdfcf5..0067ca610 100644 --- 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 6c4ab8fdd..76ef6d915 100644 --- 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 868ee4f4c..81b5bc491 100644 --- 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 6fa8721fa..3981a860a 100644 --- 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 0d123a4bd..dbf7e5ab9 100644 --- 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 58accdb1c..3504d0410 100644 --- 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 ecc1f878d..53f7e31d6 100644 --- 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 7a4ef8b50..24e080baa 100644 --- 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 f63e32cc5..e5eb9971b 100644 --- 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 ea6accbd8..3ccbe8811 100644 --- 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 b56ff2fb6..b7fbddbf1 100644 --- 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 9cc261ff8..7436664c3 100644 --- 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 b8a560831..d54ecbc0f 100644 --- 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 e36fdfa84..08a568ef0 100644 --- 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 e68192ffd..c53f95222 100644 --- 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 eef7546c5..1706cd2f1 100644 --- 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 bf35e368b..802b1effc 100644 --- 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 88e7da1f1..52870b489 100644 --- 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 bca9ab5c6..e072710be 100644 --- 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 ea91d5f69..1c1c80787 100644 --- 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 e5921ba24..21c248e67 100644 --- 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 5bb01a1df..01ffdc73e 100644 --- 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 5c1e7a6dd..a388fe437 100644 --- 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 diff --git a/lib/non-semihosting/strncmp.c b/lib/non-semihosting/strncmp.c index 984b7a061..beb90ec88 100644 --- 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 56a8a698a..31a4332e8 100644 --- 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 1f80af405..555a4788c 100644 --- 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 4a5a40477..f743c4165 100644 --- 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 e46ef4ce4..61b41f33e 100644 --- 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 6e2a1acef..0056c81d2 100644 --- 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 cc72ec214..f20672306 100644 --- 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 558973ac8..528db17fe 100644 --- 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 d3c780cbb..dab4a7587 100644 --- 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 4269d95a1..aedc312c9 100644 --- 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 7652f10e2..e79245522 100644 --- 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 c574eb9d7..8a6f49316 100644 --- 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 0adb54150..2b9903bc6 100644 --- 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 fd0e07370..1f4d78468 100644 --- 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 7a893d084..e7e844a22 100644 --- 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 822a100d0..9d19bb8ef 100644 --- 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 bb3b45a01..7212df128 100644 --- 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 47b6d5bd5..ab8e3780e 100644 --- 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 af8d1b332..fd92526d5 100644 --- 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 20f332475..53d45e462 100644 --- 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 463c637b7..399a772a3 100644 --- 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 38ac095cb..306e71a60 100644 --- 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"