summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--acknowledgements.md9
-rw-r--r--arch/aarch64/cpu/cpu_helpers.S2
-rw-r--r--arch/system/gic/aarch64/gic_v3_sysregs.S2
-rw-r--r--arch/system/gic/gic.h2
-rw-r--r--arch/system/gic/gic_v2.c2
-rw-r--r--arch/system/gic/gic_v2.h2
-rw-r--r--arch/system/gic/gic_v3.h2
-rw-r--r--bl1/aarch64/bl1_arch_setup.c2
-rw-r--r--bl1/aarch64/bl1_entrypoint.S2
-rw-r--r--bl1/aarch64/early_exceptions.S2
-rw-r--r--bl1/bl1.ld.S2
-rw-r--r--bl1/bl1.mk2
-rw-r--r--bl1/bl1_main.c2
-rw-r--r--bl2/aarch64/bl2_arch_setup.c2
-rw-r--r--bl2/aarch64/bl2_entrypoint.S2
-rw-r--r--bl2/bl2.ld.S2
-rw-r--r--bl2/bl2.mk2
-rw-r--r--bl2/bl2_main.c2
-rw-r--r--bl31/aarch64/bl31_arch_setup.c2
-rw-r--r--bl31/aarch64/bl31_entrypoint.S2
-rw-r--r--bl31/aarch64/exception_handlers.c2
-rw-r--r--bl31/aarch64/runtime_exceptions.S2
-rw-r--r--bl31/bl31.ld.S2
-rw-r--r--bl31/bl31.mk2
-rw-r--r--bl31/bl31_main.c2
-rw-r--r--common/bl_common.c2
-rw-r--r--common/psci/psci_afflvl_off.c2
-rw-r--r--common/psci/psci_afflvl_on.c2
-rw-r--r--common/psci/psci_afflvl_suspend.c2
-rw-r--r--common/psci/psci_common.c2
-rw-r--r--common/psci/psci_entry.S2
-rw-r--r--common/psci/psci_main.c2
-rw-r--r--common/psci/psci_private.h2
-rw-r--r--common/psci/psci_setup.c2
-rw-r--r--common/runtime_svc.c2
-rw-r--r--contributing.md114
-rw-r--r--docs/change-log.md9
-rw-r--r--docs/porting-guide.md2
-rw-r--r--docs/user-guide.md2
-rw-r--r--drivers/arm/interconnect/cci-400/cci400.c2
-rw-r--r--drivers/arm/interconnect/cci-400/cci400.h2
-rw-r--r--drivers/arm/peripherals/pl011/console.h2
-rw-r--r--drivers/arm/peripherals/pl011/pl011.c2
-rw-r--r--drivers/arm/peripherals/pl011/pl011.h2
-rw-r--r--drivers/power/fvp_pwrc.c2
-rw-r--r--drivers/power/fvp_pwrc.h2
-rw-r--r--fdts/fvp-base-gicv2-psci.dts2
-rw-r--r--fdts/fvp-base-gicv2legacy-psci.dts2
-rw-r--r--fdts/fvp-base-gicv3-psci.dts2
-rw-r--r--fdts/fvp-foundation-gicv2-psci.dts2
-rw-r--r--fdts/fvp-foundation-gicv2legacy-psci.dts2
-rw-r--r--fdts/fvp-foundation-gicv3-psci.dts2
-rw-r--r--fdts/fvp-foundation-motherboard.dtsi2
-rw-r--r--fdts/rtsm_ve-motherboard.dtsi2
-rw-r--r--include/aarch64/arch.h2
-rw-r--r--include/aarch64/arch_helpers.h2
-rw-r--r--include/asm_macros.S2
-rw-r--r--include/bakery_lock.h2
-rw-r--r--include/bl1.h2
-rw-r--r--include/bl2.h2
-rw-r--r--include/bl31.h2
-rw-r--r--include/bl_common.h2
-rw-r--r--include/mmio.h2
-rw-r--r--include/pm.h2
-rw-r--r--include/psci.h2
-rw-r--r--include/runtime_svc.h2
-rw-r--r--include/semihosting.h2
-rw-r--r--include/spinlock.h2
-rw-r--r--lib/arch/aarch64/cache_helpers.S2
-rw-r--r--lib/arch/aarch64/misc_helpers.S2
-rw-r--r--lib/arch/aarch64/sysreg_helpers.S2
-rw-r--r--lib/arch/aarch64/tlb_helpers.S2
-rw-r--r--lib/mmio.c2
-rw-r--r--lib/non-semihosting/ctype.h4
-rw-r--r--lib/non-semihosting/mem.c2
-rw-r--r--lib/non-semihosting/std.c2
-rw-r--r--lib/non-semihosting/strcmp.c4
-rw-r--r--lib/non-semihosting/string.c2
-rw-r--r--lib/non-semihosting/strlen.c4
-rw-r--r--lib/non-semihosting/strncmp.c4
-rw-r--r--lib/non-semihosting/strncpy.c4
-rw-r--r--lib/non-semihosting/strsep.c4
-rw-r--r--lib/non-semihosting/strtol.c4
-rw-r--r--lib/non-semihosting/strtoull.c4
-rw-r--r--lib/non-semihosting/subr_prf.c4
-rw-r--r--lib/semihosting/aarch64/semihosting_call.S2
-rw-r--r--lib/semihosting/semihosting.c2
-rw-r--r--lib/sync/locks/bakery/bakery_lock.c2
-rw-r--r--lib/sync/locks/exclusive/spinlock.S2
-rw-r--r--license.md2
-rw-r--r--plat/common/aarch64/platform_helpers.S2
-rw-r--r--plat/fvp/aarch64/bl1_plat_helpers.S2
-rw-r--r--plat/fvp/aarch64/fvp_common.c2
-rw-r--r--plat/fvp/aarch64/fvp_helpers.S2
-rw-r--r--plat/fvp/bl1_plat_setup.c2
-rw-r--r--plat/fvp/bl2_plat_setup.c2
-rw-r--r--plat/fvp/bl31_plat_setup.c2
-rw-r--r--plat/fvp/fvp_pm.c2
-rw-r--r--plat/fvp/fvp_topology.c2
-rw-r--r--plat/fvp/platform.h2
-rw-r--r--readme.md16
102 files changed, 239 insertions, 123 deletions
diff --git a/Makefile b/Makefile
index c2b258fe..e1b0b8f0 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 00000000..ef49ca33
--- /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 e7fc8f84..da632832 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 ecbc1f7f..cb5dd79a 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 f38f42b3..e4beb56a 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 f8de290a..6c928d55 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 c944df61..284c874d 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 a4fe2ce3..9777cf9e 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 7085f778..655f65de 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 119ae936..19b792c4 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 08a11225..12a36f33 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 b3f169f7..3ca2b710 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 b159fd9d..76233777 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 badda644..ab9fa8ce 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 ed457ee9..6283c1c0 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 0255d659..75970f74 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 7e9e5a5b..dee138c8 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 212aa92f..f36b7bb9 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 aae67b4f..c738677c 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 238af7bd..bbde0385 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 13725d7e..593cc1d0 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 860d8ebc..4cd3b240 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 340024d1..6d086e00 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 72b97e54..44ea620c 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 401f26a3..4e307e2e 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 e8fa2f8f..e20bb7b7 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 d1257869..8183337c 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 937ba9d1..fea2b7e8 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 b0de0632..7126b98d 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 9a2c0cfb..b68b4df7 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 6b07c530..59126baa 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 014e4cf1..2f39f360 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 eca2dece..b1aa8997 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 6505adf3..4741397c 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 9095e75d..8220b307 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 ed1225f2..0aa4460f 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 00000000..2f46d7ea
--- /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 963f5787..841def96 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 a3ef99e8..0b071118 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 8a595829..476fc001 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 60586ab2..55b4032a 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 62e2fbb1..72e6f4e6 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 b98db612..7747d4d0 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 2f6f5ea4..cc18fc09 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 53b4dab2..0a302919 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 c7db33be..2b98b054 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 a2efcc53..050c33b6 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 c8e8d13e..646afb7d 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 e53621e6..a5e0f492 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 c51a6724..4e95ee72 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 7924ff21..983ae159 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 656802ea..18b4f1e3 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 87ee3c01..bbe1e07b 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 76cae31f..cac7aa27 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 00e92c5b..3f429da3 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 055a7454..143dc6c5 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 9dc6b924..85c04812 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 f7afdfcf..0067ca61 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 6c4ab8fd..76ef6d91 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 868ee4f4..81b5bc49 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 6fa8721f..3981a860 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 0d123a4b..dbf7e5ab 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 58accdb1..3504d041 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 ecc1f878..53f7e31d 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 7a4ef8b5..24e080ba 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 f63e32cc..e5eb9971 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 ea6accbd..3ccbe881 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 b56ff2fb..b7fbddbf 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 9cc261ff..7436664c 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 b8a56083..d54ecbc0 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 e36fdfa8..08a568ef 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 e68192ff..c53f9522 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 eef7546c..1706cd2f 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 bf35e368..802b1eff 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 88e7da1f..52870b48 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 bca9ab5c..e072710b 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 ea91d5f6..1c1c8078 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 e5921ba2..21c248e6 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 5bb01a1d..01ffdc73 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 5c1e7a6d..a388fe43 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 <stddef.h>
diff --git a/lib/non-semihosting/strncmp.c b/lib/non-semihosting/strncmp.c
index 984b7a06..beb90ec8 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 56a8a698..31a4332e 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 1f80af40..555a4788 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 4a5a4047..f743c416 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 e46ef4ce..61b41f33 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 6e2a1ace..0056c81d 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 cc72ec21..f2067230 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 558973ac..528db17f 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 d3c780cb..dab4a758 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 4269d95a..aedc312c 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 7652f10e..e7924552 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 c574eb9d..8a6f4931 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 0adb5415..2b9903bc 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 fd0e0737..1f4d7846 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 7a893d08..e7e844a2 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 822a100d..9d19bb8e 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 bb3b45a0..7212df12 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 47b6d5bd..ab8e3780 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 af8d1b33..fd92526d 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 20f33247..53d45e46 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 463c637b..399a772a 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 38ac095c..306e71a6 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"