summaryrefslogtreecommitdiff
path: root/src/dev/arm
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2010-06-02 12:57:59 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2010-06-02 12:57:59 -0500
commit322f345b5117f7cc0af711b21394ae494ed3ae04 (patch)
tree972a976bbce56b9b3fadaf2dc14bb36d02032779 /src/dev/arm
parentc1aabe8172215c293f3540bce08739b22871d538 (diff)
downloadgem5-322f345b5117f7cc0af711b21394ae494ed3ae04.tar.xz
ARM: Adjust some copyrights
Diffstat (limited to 'src/dev/arm')
-rw-r--r--src/dev/arm/SConscript9
-rw-r--r--src/dev/arm/Versatile.py13
-rw-r--r--src/dev/arm/versatile.cc13
-rw-r--r--src/dev/arm/versatile.hh13
4 files changed, 45 insertions, 3 deletions
diff --git a/src/dev/arm/SConscript b/src/dev/arm/SConscript
index dd1d73e1a..7b7628fbf 100644
--- a/src/dev/arm/SConscript
+++ b/src/dev/arm/SConscript
@@ -3,6 +3,15 @@
# Copyright (c) 2009 ARM Limited
# All rights reserved.
#
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder. You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met: redistributions of source code must retain the above copyright
diff --git a/src/dev/arm/Versatile.py b/src/dev/arm/Versatile.py
index 7f36bbcf3..bc7063076 100644
--- a/src/dev/arm/Versatile.py
+++ b/src/dev/arm/Versatile.py
@@ -1,7 +1,18 @@
-# Copyright (c) 2006-2007 The Regents of The University of Michigan
# Copyright (c) 2009 ARM Limited
# All rights reserved.
#
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder. You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
+# All rights reserved.
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met: redistributions of source code must retain the above copyright
diff --git a/src/dev/arm/versatile.cc b/src/dev/arm/versatile.cc
index 7d571db99..d003c29aa 100644
--- a/src/dev/arm/versatile.cc
+++ b/src/dev/arm/versatile.cc
@@ -1,6 +1,17 @@
/*
- * Copyright (c) 2004-2005 The Regents of The University of Michigan
* Copyright (c) 2009 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder. You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
+ * Copyright (c) 2004-2005 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/dev/arm/versatile.hh b/src/dev/arm/versatile.hh
index edec3631c..791c5ed5b 100644
--- a/src/dev/arm/versatile.hh
+++ b/src/dev/arm/versatile.hh
@@ -1,6 +1,17 @@
/*
- * Copyright (c) 2004-2005 The Regents of The University of Michigan
* Copyright (c) 2009 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder. You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
+ * Copyright (c) 2004-2005 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without