diff --git a/.licenseignore b/.licenseignore deleted file mode 100644 index 7288d9926..000000000 --- a/.licenseignore +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE.txt -.git/* -*LICENSE_*.txt -.licenseignore -liblwip/include -liblwip/default_opts -liblwip/lwip-1.4.1 -libethdrivers/src/plat/zynq7000/uboot -libethdrivers/src/plat/zynq7000/zynq_gem.h -libfdt -.stylefilter diff --git a/.stylefilter b/.stylefilter index 1a22309ca..fc8a601eb 100644 --- a/.stylefilter +++ b/.stylefilter @@ -1,2 +1,5 @@ +# Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) +# SPDX-License-Identifier: BSD-2-Clause + libfdt liblwip/default_opts/lwipopts.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cd12956b..24bfe484a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2017, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.7.2) diff --git a/Findutil_libs.cmake b/Findutil_libs.cmake index 73ba91f07..ddea21bfb 100644 --- a/Findutil_libs.cmake +++ b/Findutil_libs.cmake @@ -1,13 +1,7 @@ # -# Copyright 2019, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # set(UTIL_LIBS_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE STRING "") diff --git a/libpci/LICENSE_BSD2.txt b/LICENSES/BSD-1-Clause.txt similarity index 58% rename from libpci/LICENSE_BSD2.txt rename to LICENSES/BSD-1-Clause.txt index 982302060..3b3c4e814 100644 --- a/libpci/LICENSE_BSD2.txt +++ b/LICENSES/BSD-1-Clause.txt @@ -1,26 +1,15 @@ -Files described as being under the "BSD 2-Clause" license fall under the -following license. - ------------------------------------------------------------------------ - -Copyright (c) 2014 National ICT Australia and other contributors. -All rights reserved. +Copyright (c) 1995, 1999 Berkeley Software Design, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +ARE DISCLAIMED. IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) diff --git a/LICENSES/BSD-2-Clause.txt b/LICENSES/BSD-2-Clause.txt new file mode 100644 index 000000000..baa80b56a --- /dev/null +++ b/LICENSES/BSD-2-Clause.txt @@ -0,0 +1,22 @@ +Copyright (c) All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt new file mode 100644 index 000000000..0741db789 --- /dev/null +++ b/LICENSES/BSD-3-Clause.txt @@ -0,0 +1,26 @@ +Copyright (c) . All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSES/CC-BY-SA-4.0.txt b/LICENSES/CC-BY-SA-4.0.txt new file mode 100644 index 000000000..4dfebb88f --- /dev/null +++ b/LICENSES/CC-BY-SA-4.0.txt @@ -0,0 +1,349 @@ +Creative Commons Attribution-ShareAlike 4.0 International + +Creative Commons Corporation (“Creative Commons”) is not a law firm and does +not provide legal services or legal advice. Distribution of Creative Commons +public licenses does not create a lawyer-client or other relationship. Creative +Commons makes its licenses and related information available on an “as-is” +basis. Creative Commons gives no warranties regarding its licenses, any material +licensed under their terms and conditions, or any related information. Creative +Commons disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions +that creators and other rights holders may use to share original works of +authorship and other material subject to copyright and certain other rights +specified in the public license below. The following considerations are for +informational purposes only, are not exhaustive, and do not form part of our +licenses. + +Considerations for licensors: Our public licenses are intended for use by +those authorized to give the public permission to use material in ways otherwise +restricted by copyright and certain other rights. Our licenses are irrevocable. +Licensors should read and understand the terms and conditions of the license +they choose before applying it. Licensors should also secure all rights necessary +before applying our licenses so that the public can reuse the material as +expected. Licensors should clearly mark any material not subject to the license. +This includes other CC-licensed material, or material used under an exception +or limitation to copyright. More considerations for licensors. + +Considerations for the public: By using one of our public licenses, a licensor +grants the public permission to use the licensed material under specified +terms and conditions. If the licensor’s permission is not necessary for any +reason–for example, because of any applicable exception or limitation to copyright–then +that use is not regulated by the license. Our licenses grant only permissions +under copyright and certain other rights that a licensor has authority to +grant. Use of the licensed material may still be restricted for other reasons, +including because others have copyright or other rights in the material. A +licensor may make special requests, such as asking that all changes be marked +or described. + +Although not required by our licenses, you are encouraged to respect those +requests where reasonable. More considerations for the public. + +Creative Commons Attribution-ShareAlike 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to +be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike +4.0 International Public License ("Public License"). To the extent this Public +License may be interpreted as a contract, You are granted the Licensed Rights +in consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the Licensor +receives from making the Licensed Material available under these terms and +conditions. + +Section 1 – Definitions. + +a. Adapted Material means material subject to Copyright and Similar Rights +that is derived from or based upon the Licensed Material and in which the +Licensed Material is translated, altered, arranged, transformed, or otherwise +modified in a manner requiring permission under the Copyright and Similar +Rights held by the Licensor. For purposes of this Public License, where the +Licensed Material is a musical work, performance, or sound recording, Adapted +Material is always produced where the Licensed Material is synched in timed +relation with a moving image. + +b. Adapter's License means the license You apply to Your Copyright and Similar +Rights in Your contributions to Adapted Material in accordance with the terms +and conditions of this Public License. + +c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, +approved by Creative Commons as essentially the equivalent of this Public +License. + +d. Copyright and Similar Rights means copyright and/or similar rights closely +related to copyright including, without limitation, performance, broadcast, +sound recording, and Sui Generis Database Rights, without regard to how the +rights are labeled or categorized. For purposes of this Public License, the +rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + +e. Effective Technological Measures means those measures that, in the absence +of proper authority, may not be circumvented under laws fulfilling obligations +under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, +and/or similar international agreements. + +f. Exceptions and Limitations means fair use, fair dealing, and/or any other +exception or limitation to Copyright and Similar Rights that applies to Your +use of the Licensed Material. + +g. License Elements means the license attributes listed in the name of a Creative +Commons Public License. The License Elements of this Public License are Attribution +and ShareAlike. + +h. Licensed Material means the artistic or literary work, database, or other +material to which the Licensor applied this Public License. + +i. Licensed Rights means the rights granted to You subject to the terms and +conditions of this Public License, which are limited to all Copyright and +Similar Rights that apply to Your use of the Licensed Material and that the +Licensor has authority to license. + +j. Licensor means the individual(s) or entity(ies) granting rights under this +Public License. + +k. Share means to provide material to the public by any means or process that +requires permission under the Licensed Rights, such as reproduction, public +display, public performance, distribution, dissemination, communication, or +importation, and to make material available to the public including in ways +that members of the public may access the material from a place and at a time +individually chosen by them. + +l. Sui Generis Database Rights means rights other than copyright resulting +from Directive 96/9/EC of the European Parliament and of the Council of 11 +March 1996 on the legal protection of databases, as amended and/or succeeded, +as well as other essentially equivalent rights anywhere in the world. + +m. You means the individual or entity exercising the Licensed Rights under +this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + +1. Subject to the terms and conditions of this Public License, the Licensor +hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, +irrevocable license to exercise the Licensed Rights in the Licensed Material +to: + +A. reproduce and Share the Licensed Material, in whole or in part; and + + B. produce, reproduce, and Share Adapted Material. + +2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions +and Limitations apply to Your use, this Public License does not apply, and +You do not need to comply with its terms and conditions. + +3. Term. The term of this Public License is specified in Section 6(a). + +4. Media and formats; technical modifications allowed. The Licensor authorizes +You to exercise the Licensed Rights in all media and formats whether now known +or hereafter created, and to make technical modifications necessary to do +so. The Licensor waives and/or agrees not to assert any right or authority +to forbid You from making technical modifications necessary to exercise the +Licensed Rights, including technical modifications necessary to circumvent +Effective Technological Measures. For purposes of this Public License, simply +making modifications authorized by this Section 2(a)(4) never produces Adapted +Material. + + 5. Downstream recipients. + +A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed +Material automatically receives an offer from the Licensor to exercise the +Licensed Rights under the terms and conditions of this Public License. + +B. Additional offer from the Licensor – Adapted Material. Every recipient +of Adapted Material from You automatically receives an offer from the Licensor +to exercise the Licensed Rights in the Adapted Material under the conditions +of the Adapter’s License You apply. + +C. No downstream restrictions. You may not offer or impose any additional +or different terms or conditions on, or apply any Effective Technological +Measures to, the Licensed Material if doing so restricts exercise of the Licensed +Rights by any recipient of the Licensed Material. + +6. No endorsement. Nothing in this Public License constitutes or may be construed +as permission to assert or imply that You are, or that Your use of the Licensed +Material is, connected with, or sponsored, endorsed, or granted official status +by, the Licensor or others designated to receive attribution as provided in +Section 3(a)(1)(A)(i). + + b. Other rights. + +1. Moral rights, such as the right of integrity, are not licensed under this +Public License, nor are publicity, privacy, and/or other similar personality +rights; however, to the extent possible, the Licensor waives and/or agrees +not to assert any such rights held by the Licensor to the limited extent necessary +to allow You to exercise the Licensed Rights, but not otherwise. + +2. Patent and trademark rights are not licensed under this Public License. + +3. To the extent possible, the Licensor waives any right to collect royalties +from You for the exercise of the Licensed Rights, whether directly or through +a collecting society under any voluntary or waivable statutory or compulsory +licensing scheme. In all other cases the Licensor expressly reserves any right +to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following +conditions. + + a. Attribution. + +1. If You Share the Licensed Material (including in modified form), You must: + +A. retain the following if it is supplied by the Licensor with the Licensed +Material: + +i. identification of the creator(s) of the Licensed Material and any others +designated to receive attribution, in any reasonable manner requested by the +Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + +v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + +B. indicate if You modified the Licensed Material and retain an indication +of any previous modifications; and + +C. indicate the Licensed Material is licensed under this Public License, and +include the text of, or the URI or hyperlink to, this Public License. + +2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner +based on the medium, means, and context in which You Share the Licensed Material. +For example, it may be reasonable to satisfy the conditions by providing a +URI or hyperlink to a resource that includes the required information. + +3. If requested by the Licensor, You must remove any of the information required +by Section 3(a)(1)(A) to the extent reasonably practicable. + +b. ShareAlike.In addition to the conditions in Section 3(a), if You Share +Adapted Material You produce, the following conditions also apply. + +1. The Adapter’s License You apply must be a Creative Commons license with +the same License Elements, this version or later, or a BY-SA Compatible License. + +2. You must include the text of, or the URI or hyperlink to, the Adapter's +License You apply. You may satisfy this condition in any reasonable manner +based on the medium, means, and context in which You Share Adapted Material. + +3. You may not offer or impose any additional or different terms or conditions +on, or apply any Effective Technological Measures to, Adapted Material that +restrict exercise of the rights granted under the Adapter's License You apply. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to +Your use of the Licensed Material: + +a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, +reuse, reproduce, and Share all or a substantial portion of the contents of +the database; + +b. if You include all or a substantial portion of the database contents in +a database in which You have Sui Generis Database Rights, then the database +in which You have Sui Generis Database Rights (but not its individual contents) +is Adapted Material, including for purposes of Section 3(b); and + +c. You must comply with the conditions in Section 3(a) if You Share all or +a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace +Your obligations under this Public License where the Licensed Rights include +other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + +a. Unless otherwise separately undertaken by the Licensor, to the extent possible, +the Licensor offers the Licensed Material as-is and as-available, and makes +no representations or warranties of any kind concerning the Licensed Material, +whether express, implied, statutory, or other. This includes, without limitation, +warranties of title, merchantability, fitness for a particular purpose, non-infringement, +absence of latent or other defects, accuracy, or the presence or absence of +errors, whether or not known or discoverable. Where disclaimers of warranties +are not allowed in full or in part, this disclaimer may not apply to You. + +b. To the extent possible, in no event will the Licensor be liable to You +on any legal theory (including, without limitation, negligence) or otherwise +for any direct, special, indirect, incidental, consequential, punitive, exemplary, +or other losses, costs, expenses, or damages arising out of this Public License +or use of the Licensed Material, even if the Licensor has been advised of +the possibility of such losses, costs, expenses, or damages. Where a limitation +of liability is not allowed in full or in part, this limitation may not apply +to You. + +c. The disclaimer of warranties and limitation of liability provided above +shall be interpreted in a manner that, to the extent possible, most closely +approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + +a. This Public License applies for the term of the Copyright and Similar Rights +licensed here. However, if You fail to comply with this Public License, then +Your rights under this Public License terminate automatically. + +b. Where Your right to use the Licensed Material has terminated under Section +6(a), it reinstates: + +1. automatically as of the date the violation is cured, provided it is cured +within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + +c. For the avoidance of doubt, this Section 6(b) does not affect any right +the Licensor may have to seek remedies for Your violations of this Public +License. + +d. For the avoidance of doubt, the Licensor may also offer the Licensed Material +under separate terms or conditions or stop distributing the Licensed Material +at any time; however, doing so will not terminate this Public License. + + e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + +a. The Licensor shall not be bound by any additional or different terms or +conditions communicated by You unless expressly agreed. + +b. Any arrangements, understandings, or agreements regarding the Licensed +Material not stated herein are separate from and independent of the terms +and conditions of this Public License. + +Section 8 – Interpretation. + +a. For the avoidance of doubt, this Public License does not, and shall not +be interpreted to, reduce, limit, restrict, or impose conditions on any use +of the Licensed Material that could lawfully be made without permission under +this Public License. + +b. To the extent possible, if any provision of this Public License is deemed +unenforceable, it shall be automatically reformed to the minimum extent necessary +to make it enforceable. If the provision cannot be reformed, it shall be severed +from this Public License without affecting the enforceability of the remaining +terms and conditions. + +c. No term or condition of this Public License will be waived and no failure +to comply consented to unless expressly agreed to by the Licensor. + +d. Nothing in this Public License constitutes or may be interpreted as a limitation +upon, or waiver of, any privileges and immunities that apply to the Licensor +or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative +Commons may elect to apply one of its public licenses to material it publishes +and in those instances will be considered the “Licensor.” Except for the limited +purpose of indicating that material is shared under a Creative Commons public +license or as otherwise permitted by the Creative Commons policies published +at creativecommons.org/policies, Creative Commons does not authorize the use +of the trademark “Creative Commons” or any other trademark or logo of Creative +Commons without its prior written consent including, without limitation, in +connection with any unauthorized modifications to any of its public licenses +or any other arrangements, understandings, or agreements concerning use of +licensed material. For the avoidance of doubt, this paragraph does not form +part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/LICENSES/GPL-2.0-only.txt b/LICENSES/GPL-2.0-only.txt new file mode 100644 index 000000000..3b6070fcd --- /dev/null +++ b/LICENSES/GPL-2.0-only.txt @@ -0,0 +1,311 @@ +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software +is covered by the GNU Lesser General Public License instead.) You can apply +it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom +to distribute copies of free software (and charge for this service if you +wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs; and that +you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or +for a fee, you must give the recipients all the rights that you have. You +must make sure that they, too, receive or can get the source code. And you +must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If +the software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms +of this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or translated +into another language. (Hereinafter, translation is included without limitation +in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program +is not restricted, and the output from the Program is covered only if its +contents constitute a work based on the Program (independent of having been +made by running the Program). Whether that is true depends on what the Program +does. + +1. You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and appropriately +publish on each copy an appropriate copyright notice and disclaimer of warranty; +keep intact all the notices that refer to this License and to the absence +of any warranty; and give any other recipients of the Program a copy of this +License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all +of these conditions: + +a) You must cause the modified files to carry prominent notices stating that +you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or +in part contains or is derived from the Program or any part thereof, to be +licensed as a whole at no charge to all third parties under the terms of this +License. + +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the most +ordinary way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this License. +(Exception: if the Program itself is interactive but does not normally print +such an announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, +and its terms, do not apply to those sections when you distribute them as +separate works. But when you distribute the same sections as part of a whole +which is a work based on the Program, the distribution of the whole must be +on the terms of this License, whose permissions for other licensees extend +to the entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise +the right to control the distribution of derivative or collective works based +on the Program. + +In addition, mere aggregation of another work not based on the Program with +the Program (or with a work based on the Program) on a volume of a storage +or distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under Section +2) in object code or executable form under the terms of Sections 1 and 2 above +provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, +which must be distributed under the terms of Sections 1 and 2 above on a medium +customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give +any third party, for a charge no more than your cost of physically performing +source distribution, a complete machine-readable copy of the corresponding +source code, to be distributed under the terms of Sections 1 and 2 above on +a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute +corresponding source code. (This alternative is allowed only for noncommercial +distribution and only if you received the program in object code or executable +form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with +the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except +as expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses terminated +so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the Program +(or any work based on the Program), you indicate your acceptance of this License +to do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor +to copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of +the rights granted herein. You are not responsible for enforcing compliance +by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement +or for any other reason (not limited to patent issues), conditions are imposed +on you (whether by court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the conditions of +this License. If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as +a consequence you may not distribute the Program at all. For example, if a +patent license would not permit royalty-free redistribution of the Program +by all those who receive copies directly or indirectly through you, then the +only way you could satisfy both it and this License would be to refrain entirely +from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents +or other property right claims or to contest validity of any such claims; +this section has the sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public license practices. +Many people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit geographical +distribution limitation excluding those countries, so that distribution is +permitted only in or among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose +any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing and reuse +of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE +OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES +OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + +one line to give the program's name and an idea of what it does. Copyright +(C) yyyy name of author + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how +to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when +it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author Gnomovision comes +with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, +and you are welcome to redistribute it under certain conditions; type `show +c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' +(which makes passes at compilers) written by James Hacker. + +signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0-or-later.txt new file mode 100644 index 000000000..3b6070fcd --- /dev/null +++ b/LICENSES/GPL-2.0-or-later.txt @@ -0,0 +1,311 @@ +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software +is covered by the GNU Lesser General Public License instead.) You can apply +it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom +to distribute copies of free software (and charge for this service if you +wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs; and that +you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or +for a fee, you must give the recipients all the rights that you have. You +must make sure that they, too, receive or can get the source code. And you +must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If +the software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms +of this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or translated +into another language. (Hereinafter, translation is included without limitation +in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program +is not restricted, and the output from the Program is covered only if its +contents constitute a work based on the Program (independent of having been +made by running the Program). Whether that is true depends on what the Program +does. + +1. You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and appropriately +publish on each copy an appropriate copyright notice and disclaimer of warranty; +keep intact all the notices that refer to this License and to the absence +of any warranty; and give any other recipients of the Program a copy of this +License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all +of these conditions: + +a) You must cause the modified files to carry prominent notices stating that +you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or +in part contains or is derived from the Program or any part thereof, to be +licensed as a whole at no charge to all third parties under the terms of this +License. + +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the most +ordinary way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this License. +(Exception: if the Program itself is interactive but does not normally print +such an announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, +and its terms, do not apply to those sections when you distribute them as +separate works. But when you distribute the same sections as part of a whole +which is a work based on the Program, the distribution of the whole must be +on the terms of this License, whose permissions for other licensees extend +to the entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise +the right to control the distribution of derivative or collective works based +on the Program. + +In addition, mere aggregation of another work not based on the Program with +the Program (or with a work based on the Program) on a volume of a storage +or distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under Section +2) in object code or executable form under the terms of Sections 1 and 2 above +provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, +which must be distributed under the terms of Sections 1 and 2 above on a medium +customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give +any third party, for a charge no more than your cost of physically performing +source distribution, a complete machine-readable copy of the corresponding +source code, to be distributed under the terms of Sections 1 and 2 above on +a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute +corresponding source code. (This alternative is allowed only for noncommercial +distribution and only if you received the program in object code or executable +form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with +the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except +as expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses terminated +so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the Program +(or any work based on the Program), you indicate your acceptance of this License +to do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor +to copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of +the rights granted herein. You are not responsible for enforcing compliance +by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement +or for any other reason (not limited to patent issues), conditions are imposed +on you (whether by court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the conditions of +this License. If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as +a consequence you may not distribute the Program at all. For example, if a +patent license would not permit royalty-free redistribution of the Program +by all those who receive copies directly or indirectly through you, then the +only way you could satisfy both it and this License would be to refrain entirely +from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents +or other property right claims or to contest validity of any such claims; +this section has the sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public license practices. +Many people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit geographical +distribution limitation excluding those countries, so that distribution is +permitted only in or among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose +any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing and reuse +of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE +OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES +OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + +one line to give the program's name and an idea of what it does. Copyright +(C) yyyy name of author + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how +to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when +it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author Gnomovision comes +with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, +and you are welcome to redistribute it under certain conditions; type `show +c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' +(which makes passes at compilers) written by James Hacker. + +signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice diff --git a/LICENSES/IBM-pibs.txt b/LICENSES/IBM-pibs.txt new file mode 100644 index 000000000..9b9ccd45d --- /dev/null +++ b/LICENSES/IBM-pibs.txt @@ -0,0 +1,17 @@ +This source code has been made available to you by IBM on an AS-IS basis. +Anyone receiving this source is licensed under IBM copyrights to use it in +any way he or she deems fit, including copying it, modifying it, compiling +it, and redistributing it either with or without modifications. No license +under IBM patents or patent applications is to be implied by the copyright +license. + +Any user of this software should understand that IBM cannot provide technical +support for this software and will not be responsible for any consequences +resulting from the use of this software. + +Any person who transfers this source code or any derivative work must include +the IBM copyright notice, this paragraph, and the preceding two paragraphs +in the transferred software. + +COPYRIGHT   I B M   CORPORATION 2002 +LICENSED MATERIAL  -  PROGRAM PROPERTY OF I B M diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 000000000..f0fd20ab6 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,20 @@ +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index e9d4a3559..8d79f80d7 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,9 @@ + Collection of OS independent utility libs: * libcpio - a library for parsing CPIO files. diff --git a/libcpio/CMakeLists.txt b/libcpio/CMakeLists.txt index cbc952295..b9eb19679 100644 --- a/libcpio/CMakeLists.txt +++ b/libcpio/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2017, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.7.2) diff --git a/libcpio/LICENSE_BSD2.txt b/libcpio/LICENSE_BSD2.txt deleted file mode 100644 index 982302060..000000000 --- a/libcpio/LICENSE_BSD2.txt +++ /dev/null @@ -1,30 +0,0 @@ -Files described as being under the "BSD 2-Clause" license fall under the -following license. - ------------------------------------------------------------------------ - -Copyright (c) 2014 National ICT Australia and other contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/libcpio/include/cpio/cpio.h b/libcpio/include/cpio/cpio.h index 0bb0095be..1800e4064 100644 --- a/libcpio/include/cpio/cpio.h +++ b/libcpio/include/cpio/cpio.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libcpio/src/cpio.c b/libcpio/src/cpio.c index d144d0cb4..4349d630e 100644 --- a/libcpio/src/cpio.c +++ b/libcpio/src/cpio.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libelf/CMakeLists.txt b/libelf/CMakeLists.txt index 624c55546..eda74987a 100644 --- a/libelf/CMakeLists.txt +++ b/libelf/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2017, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.7.2) diff --git a/libelf/LICENSE_BSD2.txt b/libelf/LICENSE_BSD2.txt deleted file mode 100644 index 982302060..000000000 --- a/libelf/LICENSE_BSD2.txt +++ /dev/null @@ -1,30 +0,0 @@ -Files described as being under the "BSD 2-Clause" license fall under the -following license. - ------------------------------------------------------------------------ - -Copyright (c) 2014 National ICT Australia and other contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/libelf/LICENSE_OZPLB.txt b/libelf/LICENSE_OZPLB.txt deleted file mode 100644 index 5901a5af9..000000000 --- a/libelf/LICENSE_OZPLB.txt +++ /dev/null @@ -1,76 +0,0 @@ -Australian Public Licence B (OZPLB) - -Version 1-0 - -Copyright (c) 2004 University of New South Wales - -All rights reserved. - -Developed by: Operating Systems and Distributed Systems Group (DiSy) - University of New South Wales - http://www.disy.cse.unsw.edu.au - -Permission is granted by University of New South Wales, free of charge, to -any person obtaining a copy of this software and any associated -documentation files (the "Software") to deal with the Software without -restriction, including (without limitation) the rights to use, copy, -modify, adapt, merge, publish, distribute, communicate to the public, -sublicense, and/or sell, lend or rent out copies of the Software, and -to permit persons to whom the Software is furnished to do so, subject -to the following conditions: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimers. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimers in the documentation and/or other materials provided - with the distribution. - - * Neither the name of University of New South Wales, nor the names of its - contributors, may be used to endorse or promote products derived - from this Software without specific prior written permission. - -EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT -PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND -NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS, -WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING -BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS -REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE, -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, -THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF -ERRORS, WHETHER OR NOT DISCOVERABLE. - -TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL -NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL -THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER -LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR -OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS -OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR -OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT, -CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN -CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER -DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS -CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS, -DAMAGES OR OTHER LIABILITY. - -If applicable legislation implies representations, warranties, or -conditions, or imposes obligations or liability on University of New South -Wales or one of its contributors in respect of the Software that -cannot be wholly or partly excluded, restricted or modified, the -liability of University of New South Wales or the contributor is limited, to -the full extent permitted by the applicable legislation, at its -option, to: -a. in the case of goods, any one or more of the following: -i. the replacement of the goods or the supply of equivalent goods; -ii. the repair of the goods; -iii. the payment of the cost of replacing the goods or of acquiring - equivalent goods; -iv. the payment of the cost of having the goods repaired; or -b. in the case of services: -i. the supplying of the services again; or -ii. the payment of the cost of having the services supplied again. - -The construction, validity and performance of this licence is governed -by the laws in force in New South Wales, Australia. diff --git a/libelf/include/elf/elf.h b/libelf/include/elf/elf.h index 66ebffa73..1c2bfcc2c 100644 --- a/libelf/include/elf/elf.h +++ b/libelf/include/elf/elf.h @@ -1,82 +1,7 @@ -/* @LICENSE(UNSW_OZPLB) */ - /* - * Australian Public Licence B (OZPLB) - * - * Version 1-0 - * * Copyright (c) 1999-2004 University of New South Wales * - * All rights reserved. - * - * Developed by: Operating Systems and Distributed Systems Group (DiSy) - * University of New South Wales - * http://www.disy.cse.unsw.edu.au - * - * Permission is granted by University of New South Wales, free of charge, to - * any person obtaining a copy of this software and any associated - * documentation files (the "Software") to deal with the Software without - * restriction, including (without limitation) the rights to use, copy, - * modify, adapt, merge, publish, distribute, communicate to the public, - * sublicense, and/or sell, lend or rent out copies of the Software, and - * to permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimers. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimers in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of University of New South Wales, nor the names of its - * contributors, may be used to endorse or promote products derived - * from this Software without specific prior written permission. - * - * EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT - * PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND - * NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS, - * WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS - * REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE, - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, - * THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF - * ERRORS, WHETHER OR NOT DISCOVERABLE. - * - * TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL - * NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL - * THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER - * LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR - * OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS - * OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR - * OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT, - * CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN - * CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER - * DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS - * CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS, - * DAMAGES OR OTHER LIABILITY. - * - * If applicable legislation implies representations, warranties, or - * conditions, or imposes obligations or liability on University of New South - * Wales or one of its contributors in respect of the Software that - * cannot be wholly or partly excluded, restricted or modified, the - * liability of University of New South Wales or the contributor is limited, to - * the full extent permitted by the applicable legislation, at its - * option, to: - * a. in the case of goods, any one or more of the following: - * i. the replacement of the goods or the supply of equivalent goods; - * ii. the repair of the goods; - * iii. the payment of the cost of replacing the goods or of acquiring - * equivalent goods; - * iv. the payment of the cost of having the goods repaired; or - * b. in the case of services: - * i. the supplying of the services again; or - * ii. the payment of the cost of having the services supplied again. - * - * The construction, validity and performance of this licence is governed - * by the laws in force in New South Wales, Australia. + * SPDX-License-Identifier: BSD-2-Clause */ /* diff --git a/libelf/include/elf/elf32.h b/libelf/include/elf/elf32.h index 9bc6664ca..d5ae47b21 100644 --- a/libelf/include/elf/elf32.h +++ b/libelf/include/elf/elf32.h @@ -1,83 +1,9 @@ -/* @LICENSE(UNSW_OZPLB) */ - /* - * Australian Public Licence B (OZPLB) - * - * Version 1-0 - * - * Copyright (c) 2004 University of New South Wales - * - * All rights reserved. - * - * Developed by: Operating Systems and Distributed Systems Group (DiSy) - * University of New South Wales - * http://www.disy.cse.unsw.edu.au - * - * Permission is granted by University of New South Wales, free of charge, to - * any person obtaining a copy of this software and any associated - * documentation files (the "Software") to deal with the Software without - * restriction, including (without limitation) the rights to use, copy, - * modify, adapt, merge, publish, distribute, communicate to the public, - * sublicense, and/or sell, lend or rent out copies of the Software, and - * to permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimers. + * Copyright (c) 1999-2004 University of New South Wales * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimers in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of University of New South Wales, nor the names of its - * contributors, may be used to endorse or promote products derived - * from this Software without specific prior written permission. - * - * EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT - * PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND - * NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS, - * WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS - * REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE, - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, - * THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF - * ERRORS, WHETHER OR NOT DISCOVERABLE. - * - * TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL - * NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL - * THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER - * LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR - * OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS - * OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR - * OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT, - * CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN - * CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER - * DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS - * CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS, - * DAMAGES OR OTHER LIABILITY. - * - * If applicable legislation implies representations, warranties, or - * conditions, or imposes obligations or liability on University of New South - * Wales or one of its contributors in respect of the Software that - * cannot be wholly or partly excluded, restricted or modified, the - * liability of University of New South Wales or the contributor is limited, to - * the full extent permitted by the applicable legislation, at its - * option, to: - * a. in the case of goods, any one or more of the following: - * i. the replacement of the goods or the supply of equivalent goods; - * ii. the repair of the goods; - * iii. the payment of the cost of replacing the goods or of acquiring - * equivalent goods; - * iv. the payment of the cost of having the goods repaired; or - * b. in the case of services: - * i. the supplying of the services again; or - * ii. the payment of the cost of having the services supplied again. - * - * The construction, validity and performance of this licence is governed - * by the laws in force in New South Wales, Australia. + * SPDX-License-Identifier: BSD-2-Clause */ + #pragma once #include diff --git a/libelf/include/elf/elf64.h b/libelf/include/elf/elf64.h index 79c11ddcf..06b0197ee 100644 --- a/libelf/include/elf/elf64.h +++ b/libelf/include/elf/elf64.h @@ -1,83 +1,9 @@ -/* @LICENSE(UNSW_OZPLB) */ - /* - * Australian Public Licence B (OZPLB) - * - * Version 1-0 - * - * Copyright (c) 2004 University of New South Wales - * - * All rights reserved. - * - * Developed by: Operating Systems and Distributed Systems Group (DiSy) - * University of New South Wales - * http://www.disy.cse.unsw.edu.au - * - * Permission is granted by University of New South Wales, free of charge, to - * any person obtaining a copy of this software and any associated - * documentation files (the "Software") to deal with the Software without - * restriction, including (without limitation) the rights to use, copy, - * modify, adapt, merge, publish, distribute, communicate to the public, - * sublicense, and/or sell, lend or rent out copies of the Software, and - * to permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimers. + * Copyright (c) 1999-2004 University of New South Wales * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimers in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of University of New South Wales, nor the names of its - * contributors, may be used to endorse or promote products derived - * from this Software without specific prior written permission. - * - * EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT - * PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND - * NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS, - * WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS - * REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE, - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, - * THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF - * ERRORS, WHETHER OR NOT DISCOVERABLE. - * - * TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL - * NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL - * THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER - * LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR - * OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS - * OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR - * OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT, - * CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN - * CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER - * DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS - * CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS, - * DAMAGES OR OTHER LIABILITY. - * - * If applicable legislation implies representations, warranties, or - * conditions, or imposes obligations or liability on University of New South - * Wales or one of its contributors in respect of the Software that - * cannot be wholly or partly excluded, restricted or modified, the - * liability of University of New South Wales or the contributor is limited, to - * the full extent permitted by the applicable legislation, at its - * option, to: - * a. in the case of goods, any one or more of the following: - * i. the replacement of the goods or the supply of equivalent goods; - * ii. the repair of the goods; - * iii. the payment of the cost of replacing the goods or of acquiring - * equivalent goods; - * iv. the payment of the cost of having the goods repaired; or - * b. in the case of services: - * i. the supplying of the services again; or - * ii. the payment of the cost of having the services supplied again. - * - * The construction, validity and performance of this licence is governed - * by the laws in force in New South Wales, Australia. + * SPDX-License-Identifier: BSD-2-Clause */ + #pragma once #include diff --git a/libelf/src/elf.c b/libelf/src/elf.c index 8c7712e33..6ee98d02b 100644 --- a/libelf/src/elf.c +++ b/libelf/src/elf.c @@ -1,83 +1,9 @@ -/* @LICENSE(UNSW_OZPLB) */ - /* - * Australian Public Licence B (OZPLB) - * - * Version 1-0 - * - * Copyright (c) 2004 University of New South Wales - * - * All rights reserved. - * - * Developed by: Operating Systems and Distributed Systems Group (DiSy) - * University of New South Wales - * http://www.disy.cse.unsw.edu.au - * - * Permission is granted by University of New South Wales, free of charge, to - * any person obtaining a copy of this software and any associated - * documentation files (the "Software") to deal with the Software without - * restriction, including (without limitation) the rights to use, copy, - * modify, adapt, merge, publish, distribute, communicate to the public, - * sublicense, and/or sell, lend or rent out copies of the Software, and - * to permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimers. + * Copyright (c) 1999-2004 University of New South Wales * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimers in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of University of New South Wales, nor the names of its - * contributors, may be used to endorse or promote products derived - * from this Software without specific prior written permission. - * - * EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT - * PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND - * NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS, - * WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS - * REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE, - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, - * THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF - * ERRORS, WHETHER OR NOT DISCOVERABLE. - * - * TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL - * NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL - * THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER - * LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR - * OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS - * OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR - * OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT, - * CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN - * CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER - * DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS - * CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS, - * DAMAGES OR OTHER LIABILITY. - * - * If applicable legislation implies representations, warranties, or - * conditions, or imposes obligations or liability on University of New South - * Wales or one of its contributors in respect of the Software that - * cannot be wholly or partly excluded, restricted or modified, the - * liability of University of New South Wales or the contributor is limited, to - * the full extent permitted by the applicable legislation, at its - * option, to: - * a. in the case of goods, any one or more of the following: - * i. the replacement of the goods or the supply of equivalent goods; - * ii. the repair of the goods; - * iii. the payment of the cost of replacing the goods or of acquiring - * equivalent goods; - * iv. the payment of the cost of having the goods repaired; or - * b. in the case of services: - * i. the supplying of the services again; or - * ii. the payment of the cost of having the services supplied again. - * - * The construction, validity and performance of this licence is governed - * by the laws in force in New South Wales, Australia. + * SPDX-License-Identifier: BSD-2-Clause */ + #include #include #include diff --git a/libelf/src/elf32.c b/libelf/src/elf32.c index 544d17759..7a56a3bbd 100644 --- a/libelf/src/elf32.c +++ b/libelf/src/elf32.c @@ -1,83 +1,9 @@ -/* @LICENSE(UNSW_OZPLB) */ - /* - * Australian Public Licence B (OZPLB) - * - * Version 1-0 - * - * Copyright (c) 2004 University of New South Wales - * - * All rights reserved. - * - * Developed by: Operating Systems and Distributed Systems Group (DiSy) - * University of New South Wales - * http://www.disy.cse.unsw.edu.au - * - * Permission is granted by University of New South Wales, free of charge, to - * any person obtaining a copy of this software and any associated - * documentation files (the "Software") to deal with the Software without - * restriction, including (without limitation) the rights to use, copy, - * modify, adapt, merge, publish, distribute, communicate to the public, - * sublicense, and/or sell, lend or rent out copies of the Software, and - * to permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimers. + * Copyright (c) 1999-2004 University of New South Wales * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimers in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of University of New South Wales, nor the names of its - * contributors, may be used to endorse or promote products derived - * from this Software without specific prior written permission. - * - * EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT - * PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND - * NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS, - * WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS - * REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE, - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, - * THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF - * ERRORS, WHETHER OR NOT DISCOVERABLE. - * - * TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL - * NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL - * THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER - * LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR - * OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS - * OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR - * OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT, - * CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN - * CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER - * DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS - * CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS, - * DAMAGES OR OTHER LIABILITY. - * - * If applicable legislation implies representations, warranties, or - * conditions, or imposes obligations or liability on University of New South - * Wales or one of its contributors in respect of the Software that - * cannot be wholly or partly excluded, restricted or modified, the - * liability of University of New South Wales or the contributor is limited, to - * the full extent permitted by the applicable legislation, at its - * option, to: - * a. in the case of goods, any one or more of the following: - * i. the replacement of the goods or the supply of equivalent goods; - * ii. the repair of the goods; - * iii. the payment of the cost of replacing the goods or of acquiring - * equivalent goods; - * iv. the payment of the cost of having the goods repaired; or - * b. in the case of services: - * i. the supplying of the services again; or - * ii. the payment of the cost of having the services supplied again. - * - * The construction, validity and performance of this licence is governed - * by the laws in force in New South Wales, Australia. + * SPDX-License-Identifier: BSD-2-Clause */ + #include #include #include diff --git a/libelf/src/elf64.c b/libelf/src/elf64.c index 73ee2f0f5..4923f1ed4 100644 --- a/libelf/src/elf64.c +++ b/libelf/src/elf64.c @@ -1,83 +1,9 @@ -/* @LICENSE(UNSW_OZPLB) */ - /* - * Australian Public Licence B (OZPLB) - * - * Version 1-0 - * - * Copyright (c) 2004 University of New South Wales - * - * All rights reserved. - * - * Developed by: Operating Systems and Distributed Systems Group (DiSy) - * University of New South Wales - * http://www.disy.cse.unsw.edu.au - * - * Permission is granted by University of New South Wales, free of charge, to - * any person obtaining a copy of this software and any associated - * documentation files (the "Software") to deal with the Software without - * restriction, including (without limitation) the rights to use, copy, - * modify, adapt, merge, publish, distribute, communicate to the public, - * sublicense, and/or sell, lend or rent out copies of the Software, and - * to permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimers. + * Copyright (c) 1999-2004 University of New South Wales * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimers in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of University of New South Wales, nor the names of its - * contributors, may be used to endorse or promote products derived - * from this Software without specific prior written permission. - * - * EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT - * PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS", AND - * NATIONAL ICT AUSTRALIA AND ITS CONTRIBUTORS MAKE NO REPRESENTATIONS, - * WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS - * REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE, - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, - * THE ABSENCE OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF - * ERRORS, WHETHER OR NOT DISCOVERABLE. - * - * TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL - * NATIONAL ICT AUSTRALIA OR ITS CONTRIBUTORS BE LIABLE ON ANY LEGAL - * THEORY (INCLUDING, WITHOUT LIMITATION, IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHERWISE) FOR ANY CLAIM, LOSS, DAMAGES OR OTHER - * LIABILITY, INCLUDING (WITHOUT LIMITATION) LOSS OF PRODUCTION OR - * OPERATION TIME, LOSS, DAMAGE OR CORRUPTION OF DATA OR RECORDS; OR LOSS - * OF ANTICIPATED SAVINGS, OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR - * OTHER ECONOMIC LOSS; OR ANY SPECIAL, INCIDENTAL, INDIRECT, - * CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES, ARISING OUT OF OR IN - * CONNECTION WITH THIS LICENCE, THE SOFTWARE OR THE USE OF OR OTHER - * DEALINGS WITH THE SOFTWARE, EVEN IF NATIONAL ICT AUSTRALIA OR ITS - * CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH CLAIM, LOSS, - * DAMAGES OR OTHER LIABILITY. - * - * If applicable legislation implies representations, warranties, or - * conditions, or imposes obligations or liability on University of New South - * Wales or one of its contributors in respect of the Software that - * cannot be wholly or partly excluded, restricted or modified, the - * liability of University of New South Wales or the contributor is limited, to - * the full extent permitted by the applicable legislation, at its - * option, to: - * a. in the case of goods, any one or more of the following: - * i. the replacement of the goods or the supply of equivalent goods; - * ii. the repair of the goods; - * iii. the payment of the cost of replacing the goods or of acquiring - * equivalent goods; - * iv. the payment of the cost of having the goods repaired; or - * b. in the case of services: - * i. the supplying of the services again; or - * ii. the payment of the cost of having the services supplied again. - * - * The construction, validity and performance of this licence is governed - * by the laws in force in New South Wales, Australia. + * SPDX-License-Identifier: BSD-2-Clause */ + #include #include #include diff --git a/libethdrivers/CMakeLists.txt b/libethdrivers/CMakeLists.txt index 93b714351..594e9eafe 100644 --- a/libethdrivers/CMakeLists.txt +++ b/libethdrivers/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2018, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.8.2) diff --git a/libethdrivers/LICENSE_GPLv2.txt b/libethdrivers/LICENSE_GPLv2.txt deleted file mode 100644 index e418701b2..000000000 --- a/libethdrivers/LICENSE_GPLv2.txt +++ /dev/null @@ -1,295 +0,0 @@ - -Files described as being under the "GNU General Public License version 2" -or simply the "GPLv2" fall under the following license. - -Note that this copyright does not cover user programs that use kernel -services by normal system calls --- this is merely considered normal use -of the kernel, and does not fall under the heading of "derived work". - -Also note that while the Free Software Foundation owns the copyright to -the license text below, copyright for the actual files included in this -project are held by their respective owners, indicated at the top of -each file. - ------------------------------------------------------------------------ - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/libethdrivers/include/ethdrivers/am335x.h b/libethdrivers/include/ethdrivers/am335x.h index c7f6df790..f39a31b12 100644 --- a/libethdrivers/include/ethdrivers/am335x.h +++ b/libethdrivers/include/ethdrivers/am335x.h @@ -1,13 +1,7 @@ /* - * Copyright 2016, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2016, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef __ETHIF_AM335X_DRIVER_H diff --git a/libethdrivers/include/ethdrivers/helpers.h b/libethdrivers/include/ethdrivers/helpers.h index b268c641d..020f70189 100644 --- a/libethdrivers/include/ethdrivers/helpers.h +++ b/libethdrivers/include/ethdrivers/helpers.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/include/ethdrivers/imx6.h b/libethdrivers/include/ethdrivers/imx6.h index 3affba513..8039278cc 100644 --- a/libethdrivers/include/ethdrivers/imx6.h +++ b/libethdrivers/include/ethdrivers/imx6.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/include/ethdrivers/intel.h b/libethdrivers/include/ethdrivers/intel.h index ee9b34e0d..6759b1044 100644 --- a/libethdrivers/include/ethdrivers/intel.h +++ b/libethdrivers/include/ethdrivers/intel.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/include/ethdrivers/lwip.h b/libethdrivers/include/ethdrivers/lwip.h index 6299099b2..c31d1174d 100644 --- a/libethdrivers/include/ethdrivers/lwip.h +++ b/libethdrivers/include/ethdrivers/lwip.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/include/ethdrivers/pico_dev_eth.h b/libethdrivers/include/ethdrivers/pico_dev_eth.h index cd9342d50..7ee9be76a 100644 --- a/libethdrivers/include/ethdrivers/pico_dev_eth.h +++ b/libethdrivers/include/ethdrivers/pico_dev_eth.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libethdrivers/include/ethdrivers/raw.h b/libethdrivers/include/ethdrivers/raw.h index 1b3f12104..496293f00 100644 --- a/libethdrivers/include/ethdrivers/raw.h +++ b/libethdrivers/include/ethdrivers/raw.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/include/ethdrivers/tx2.h b/libethdrivers/include/ethdrivers/tx2.h index 8e274014f..a980f3095 100644 --- a/libethdrivers/include/ethdrivers/tx2.h +++ b/libethdrivers/include/ethdrivers/tx2.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/include/ethdrivers/virtio/virtio_config.h b/libethdrivers/include/ethdrivers/virtio/virtio_config.h index f39fdf18d..c26b69319 100644 --- a/libethdrivers/include/ethdrivers/virtio/virtio_config.h +++ b/libethdrivers/include/ethdrivers/virtio/virtio_config.h @@ -1,4 +1,6 @@ -/* @TAG(OTHER_BSD) */ +/* SPDX-License-Identifier: BSD-3-Clause + Copyright Linux */ + #pragma once /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so * anyone can use the definitions to implement compatible drivers/servers. diff --git a/libethdrivers/include/ethdrivers/virtio/virtio_net.h b/libethdrivers/include/ethdrivers/virtio/virtio_net.h index dd7ef72e5..afc3035c5 100644 --- a/libethdrivers/include/ethdrivers/virtio/virtio_net.h +++ b/libethdrivers/include/ethdrivers/virtio/virtio_net.h @@ -1,4 +1,6 @@ -/* @TAG(OTHER_BSD) */ +/* SPDX-License-Identifier: BSD-3-Clause + Copyright Linux */ + #pragma once /* This header is BSD licensed so anyone can use the definitions to implement * compatible drivers/servers. diff --git a/libethdrivers/include/ethdrivers/virtio/virtio_pci.h b/libethdrivers/include/ethdrivers/virtio/virtio_pci.h index 2c6c89f16..aefa2cb97 100644 --- a/libethdrivers/include/ethdrivers/virtio/virtio_pci.h +++ b/libethdrivers/include/ethdrivers/virtio/virtio_pci.h @@ -1,4 +1,4 @@ -/* @TAG(CUSTOM) */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Virtio PCI driver * diff --git a/libethdrivers/include/ethdrivers/virtio/virtio_ring.h b/libethdrivers/include/ethdrivers/virtio/virtio_ring.h index e458ad29a..14aa60964 100644 --- a/libethdrivers/include/ethdrivers/virtio/virtio_ring.h +++ b/libethdrivers/include/ethdrivers/virtio/virtio_ring.h @@ -1,4 +1,4 @@ -/* @TAG(CUSTOM) */ +/* SPDX-License-Identifier: BSD-3-Clause */ #pragma once /* An interface for efficient virtio implementation, currently for use by KVM * and lguest, but hopefully others soon. Do NOT change this since it will diff --git a/libethdrivers/include/ethdrivers/virtio_pci.h b/libethdrivers/include/ethdrivers/virtio_pci.h index c4f30956a..3cb746649 100644 --- a/libethdrivers/include/ethdrivers/virtio_pci.h +++ b/libethdrivers/include/ethdrivers/virtio_pci.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/include/ethdrivers/zynq7000.h b/libethdrivers/include/ethdrivers/zynq7000.h index a316e7601..acc252d3d 100644 --- a/libethdrivers/include/ethdrivers/zynq7000.h +++ b/libethdrivers/include/ethdrivers/zynq7000.h @@ -1,11 +1,7 @@ /* * Copyright 2017, DornerWorks, Ltd. * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef __ETHIF_ZYNQ7000_DRIVER_H diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/beaglebone.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/beaglebone.h index 92484f109..592c433a0 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/beaglebone.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/beaglebone.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file beaglebone.h * * \brief This file contains prototype declarations of functions which diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/cpsw.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/cpsw.h index cad673d1e..412ea9d9b 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/cpsw.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/cpsw.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//* +/* SPDX-License-Identifier: BSD-3-Clause */ + /** * \file cpsw.h * diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/dmtimer.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/dmtimer.h index b31f8fc0c..908a4f558 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/dmtimer.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/dmtimer.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file dmtimer.h * * \brief DMTimer API prototypes and macros. diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/edma.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/edma.h index b41c089e0..bd7e85e2a 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/edma.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/edma.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file edma.h * * \brief This file contains the function prototypes for the device diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_cefuse.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_cefuse.h index 13c0a7985..141f755fb 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_cefuse.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_cefuse.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CM * * @Filename: ../../CredDataBase/prcmCRED/cm_cefuse_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_device.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_device.h index 9d873052c..c86052a46 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_device.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_device.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CM * * @Filename: ../../CredDataBase/prcmCRED/cm_device_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_dpll.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_dpll.h index 34b6cc5b7..b7d3c63e6 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_dpll.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_dpll.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CM * * @Filename: ../../CredDataBase/prcmCRED/cm_dpll_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_gfx.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_gfx.h index 2522ac5b6..99468b473 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_gfx.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_gfx.h @@ -1,4 +1,6 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ + +/** * @Component: CM * * @Filename: ../../CredDataBase/prcmCRED/cm_gfx_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_mpu.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_mpu.h index bd0b8c73f..da5f6e52c 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_mpu.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_mpu.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CM * * @Filename: ../../CredDataBase/prcmCRED/cm_mpu_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_per.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_per.h index f3539198e..0b7ef67fd 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_per.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_per.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CM * * @Filename: ../../CredDataBase/prcmCRED/cm_per_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_rtc.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_rtc.h index 07d8aa570..89f6f950e 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_rtc.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_rtc.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CM * * @Filename: ../../CredDataBase/prcmCRED/cm_rtc_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_wkup.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_wkup.h index a3de3f693..ab93961d9 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_wkup.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cm_wkup.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CM * * @Filename: ../../CredDataBase/prcmCRED/cm_wkup_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_control_AM335x.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_control_AM335x.h index 23cb329b8..2af4e3c67 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_control_AM335x.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_control_AM335x.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CONTROL * * @Filename: ../../CredDataBase/CONTROL_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_ale.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_ale.h index a925c3365..1b16be7a3 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_ale.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_ale.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CPSW * * @Filename: cpsw_ale_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_cpdma.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_cpdma.h index 8a4fde98a..b5e870570 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_cpdma.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_cpdma.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CPSW * * @Filename: cpsw_CPDMA_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_port.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_port.h index de9ecf231..8dfba138b 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_port.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_port.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CPSW * * @Filename: cpsw_port_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_sl.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_sl.h index beb0db617..def74a377 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_sl.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_sl.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CPSW * * @Filename: cpsw_sl_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_ss.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_ss.h index f3882b92c..40e341533 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_ss.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_ss.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CPSW * * @Filename: cpsw_ss_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_wr.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_wr.h index 340fcbf6e..6cd9068d0 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_wr.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_cpsw_wr.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: CPSW * * @Filename: cpsw_wr_cred.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_dmtimer.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_dmtimer.h index 0a3963bea..d9db6fdb9 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_dmtimer.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_dmtimer.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: DMTIMER * * @Filename: hw_dmtimer.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_edma3cc.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_edma3cc.h index 2ddfc6d2e..1b43da6e4 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_edma3cc.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_edma3cc.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file hw_edma3cc.h * * \brief EDMA3CC register definitions diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_edma3tc.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_edma3tc.h index 6467a7b80..6fa0fab0e 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_edma3tc.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_edma3tc.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file hw_edma3tc.h * * \brief EDMA3TC register definitions diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_intc.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_intc.h index 6e696f61a..961d2f613 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_intc.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_intc.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * @Component: INTC * * @Filename: intc_header.h diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_mdio.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_mdio.h index f9bc6db2e..62a09f5fa 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_mdio.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_mdio.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file hw_mdio.h * * \brief MDIO register definitions diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_types.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_types.h index 264077c01..3d9c961b2 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_types.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/hw_types.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file hw_types.h * * \brief Common type definitions and macros diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/soc_AM335x.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/soc_AM335x.h index f7b24e99e..58d863553 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/soc_AM335x.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/hw/soc_AM335x.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** ============================================================================ +/* SPDX-License-Identifier: BSD-3-Clause */ +/** ============================================================================ * \file soc_AM33XX.h * * \brief This file contains the peripheral information for AM33XX SoC diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/interrupt.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/interrupt.h index 81ac25a2c..9a9bae948 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/interrupt.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/interrupt.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file interrupt.h * * \brief Interrupt related API declarations. diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/mdio.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/mdio.h index d8042602d..9d7d0aec1 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/mdio.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/mdio.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file mdio.h * * \brief MDIO APIs and macros. diff --git a/libethdrivers/plat_include/am335x/ethdrivers/plat/phy.h b/libethdrivers/plat_include/am335x/ethdrivers/plat/phy.h index 65a501aae..40d824c8e 100644 --- a/libethdrivers/plat_include/am335x/ethdrivers/plat/phy.h +++ b/libethdrivers/plat_include/am335x/ethdrivers/plat/phy.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file phy.h * * \brief Macros and function definitions for EMAC PHY diff --git a/libethdrivers/plat_include/imx6/ethdrivers/plat/eth_plat.h b/libethdrivers/plat_include/imx6/ethdrivers/plat/eth_plat.h index ae0e120b3..945e15ab4 100644 --- a/libethdrivers/plat_include/imx6/ethdrivers/plat/eth_plat.h +++ b/libethdrivers/plat_include/imx6/ethdrivers/plat/eth_plat.h @@ -1,11 +1,7 @@ /* * Copyright 2017, DORNERWORKS * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DORNERWORKS_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/plat_include/zynq7000/ethdrivers/plat/eth_plat.h b/libethdrivers/plat_include/zynq7000/ethdrivers/plat/eth_plat.h index 524a6d9e0..ab243223a 100644 --- a/libethdrivers/plat_include/zynq7000/ethdrivers/plat/eth_plat.h +++ b/libethdrivers/plat_include/zynq7000/ethdrivers/plat/eth_plat.h @@ -1,11 +1,7 @@ /* * Copyright 2017, DORNERWORKS * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DORNERWORKS_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/debug.h b/libethdrivers/src/debug.h index 26ab75eb5..331c32234 100644 --- a/libethdrivers/src/debug.h +++ b/libethdrivers/src/debug.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/helpers.c b/libethdrivers/src/helpers.c index c59395b71..d8e8ebe31 100644 --- a/libethdrivers/src/helpers.c +++ b/libethdrivers/src/helpers.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/lwip.c b/libethdrivers/src/lwip.c index 221ce626f..e45fc3a81 100644 --- a/libethdrivers/src/lwip.c +++ b/libethdrivers/src/lwip.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/pico_dev_eth.c b/libethdrivers/src/pico_dev_eth.c index 05b08282a..144392dd3 100644 --- a/libethdrivers/src/pico_dev_eth.c +++ b/libethdrivers/src/pico_dev_eth.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libethdrivers/src/plat/am335x/beaglebone.c b/libethdrivers/src/plat/am335x/beaglebone.c index 25086ef89..513ed4d65 100644 --- a/libethdrivers/src/plat/am335x/beaglebone.c +++ b/libethdrivers/src/plat/am335x/beaglebone.c @@ -1,13 +1,7 @@ /* - * Copyright 2016, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2016, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/plat/am335x/cpsw.c b/libethdrivers/src/plat/am335x/cpsw.c index 5a66ae13a..509794d40 100644 --- a/libethdrivers/src/plat/am335x/cpsw.c +++ b/libethdrivers/src/plat/am335x/cpsw.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libethdrivers/src/plat/am335x/cpsw/cpswif.c b/libethdrivers/src/plat/am335x/cpsw/cpswif.c index 0ddb36e3a..f9320aeba 100644 --- a/libethdrivers/src/plat/am335x/cpsw/cpswif.c +++ b/libethdrivers/src/plat/am335x/cpsw/cpswif.c @@ -1,4 +1,4 @@ -/* @TAG(CUSTOM) */ +/* SPDX-License-Identifier: BSD-3-Clause */ /** * @file - cpswif.c diff --git a/libethdrivers/src/plat/am335x/cpsw/cpswif.h b/libethdrivers/src/plat/am335x/cpsw/cpswif.h index b318521ed..1caec47c6 100644 --- a/libethdrivers/src/plat/am335x/cpsw/cpswif.h +++ b/libethdrivers/src/plat/am335x/cpsw/cpswif.h @@ -1,4 +1,4 @@ -/* @TAG(CUSTOM) */ +/* SPDX-License-Identifier: BSD-3-Clause */ /** * @file - cpswif.h diff --git a/libethdrivers/src/plat/am335x/cpsw_beaglebone.c b/libethdrivers/src/plat/am335x/cpsw_beaglebone.c index 0dc381d55..0ed239f9a 100644 --- a/libethdrivers/src/plat/am335x/cpsw_beaglebone.c +++ b/libethdrivers/src/plat/am335x/cpsw_beaglebone.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libethdrivers/src/plat/am335x/edma.c b/libethdrivers/src/plat/am335x/edma.c index a495ec799..2bcc967b0 100644 --- a/libethdrivers/src/plat/am335x/edma.c +++ b/libethdrivers/src/plat/am335x/edma.c @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) *//** +/* SPDX-License-Identifier: BSD-3-Clause */ +/** * \file edma.c * * \brief This file contains device abstraction layer APIs for the EDMA device. diff --git a/libethdrivers/src/plat/am335x/edma_beaglebone.c b/libethdrivers/src/plat/am335x/edma_beaglebone.c index 6bce0624b..3d4e42573 100644 --- a/libethdrivers/src/plat/am335x/edma_beaglebone.c +++ b/libethdrivers/src/plat/am335x/edma_beaglebone.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libethdrivers/src/plat/am335x/lwiplib.h b/libethdrivers/src/plat/am335x/lwiplib.h index 4d8a9438f..dd1b3ae74 100644 --- a/libethdrivers/src/plat/am335x/lwiplib.h +++ b/libethdrivers/src/plat/am335x/lwiplib.h @@ -1,4 +1,4 @@ -/* @TAG(CUSTOM) */ +/* SPDX-License-Identifier: BSD-3-Clause */ /** * \file lwiplib.h diff --git a/libethdrivers/src/plat/am335x/mdio.c b/libethdrivers/src/plat/am335x/mdio.c index 26f24e6a7..c1fdd36c0 100644 --- a/libethdrivers/src/plat/am335x/mdio.c +++ b/libethdrivers/src/plat/am335x/mdio.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libethdrivers/src/plat/am335x/phy.c b/libethdrivers/src/plat/am335x/phy.c index 518aaec94..4f030c899 100644 --- a/libethdrivers/src/plat/am335x/phy.c +++ b/libethdrivers/src/plat/am335x/phy.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libethdrivers/src/plat/imx6/enet.c b/libethdrivers/src/plat/imx6/enet.c index 22074479f..64e3fbf1d 100644 --- a/libethdrivers/src/plat/imx6/enet.c +++ b/libethdrivers/src/plat/imx6/enet.c @@ -1,14 +1,8 @@ /* * Copyright 2017, NXP - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include "enet.h" diff --git a/libethdrivers/src/plat/imx6/enet.h b/libethdrivers/src/plat/imx6/enet.h index 1db7e66ab..2710a7435 100644 --- a/libethdrivers/src/plat/imx6/enet.h +++ b/libethdrivers/src/plat/imx6/enet.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/plat/imx6/imx6.c b/libethdrivers/src/plat/imx6/imx6.c index 069ace489..50d1874e4 100644 --- a/libethdrivers/src/plat/imx6/imx6.c +++ b/libethdrivers/src/plat/imx6/imx6.c @@ -1,14 +1,8 @@ /* * Copyright 2017, DornerWorks - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/plat/imx6/io.h b/libethdrivers/src/plat/imx6/io.h index 0a9d6c93d..548611ff2 100644 --- a/libethdrivers/src/plat/imx6/io.h +++ b/libethdrivers/src/plat/imx6/io.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/plat/imx6/ocotp_ctrl.c b/libethdrivers/src/plat/imx6/ocotp_ctrl.c index 7be5b4592..76be9cea5 100644 --- a/libethdrivers/src/plat/imx6/ocotp_ctrl.c +++ b/libethdrivers/src/plat/imx6/ocotp_ctrl.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /* Author Alex Kroh */ diff --git a/libethdrivers/src/plat/imx6/ocotp_ctrl.h b/libethdrivers/src/plat/imx6/ocotp_ctrl.h index 9c2788df3..fd60abde3 100644 --- a/libethdrivers/src/plat/imx6/ocotp_ctrl.h +++ b/libethdrivers/src/plat/imx6/ocotp_ctrl.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/plat/imx6/uboot/bitops.h b/libethdrivers/src/plat/imx6/uboot/bitops.h index 791fb0480..3839c2033 100644 --- a/libethdrivers/src/plat/imx6/uboot/bitops.h +++ b/libethdrivers/src/plat/imx6/uboot/bitops.h @@ -1,5 +1,6 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only + * Copyright Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ #pragma once diff --git a/libethdrivers/src/plat/imx6/uboot/common.h b/libethdrivers/src/plat/imx6/uboot/common.h index 1ebc86a16..81a7a2a4c 100644 --- a/libethdrivers/src/plat/imx6/uboot/common.h +++ b/libethdrivers/src/plat/imx6/uboot/common.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/config.h b/libethdrivers/src/plat/imx6/uboot/config.h index 5a8b472ff..9d3e2cd9a 100644 --- a/libethdrivers/src/plat/imx6/uboot/config.h +++ b/libethdrivers/src/plat/imx6/uboot/config.h @@ -1,5 +1,6 @@ /* - * @TAG(OTHER_GPL) + * Copyright 2015, Data61, CSIRO (ABN 41 687 119 230) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/plat/imx6/uboot/ethtool.h b/libethdrivers/src/plat/imx6/uboot/ethtool.h index 4d88e8265..8ba0bfdce 100644 --- a/libethdrivers/src/plat/imx6/uboot/ethtool.h +++ b/libethdrivers/src/plat/imx6/uboot/ethtool.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/fec_mxc.c b/libethdrivers/src/plat/imx6/uboot/fec_mxc.c index c06820a2e..d51606936 100644 --- a/libethdrivers/src/plat/imx6/uboot/fec_mxc.c +++ b/libethdrivers/src/plat/imx6/uboot/fec_mxc.c @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/fec_mxc.h b/libethdrivers/src/plat/imx6/uboot/fec_mxc.h index 89ef35a59..66fc9b6d7 100644 --- a/libethdrivers/src/plat/imx6/uboot/fec_mxc.h +++ b/libethdrivers/src/plat/imx6/uboot/fec_mxc.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/gpio.h b/libethdrivers/src/plat/imx6/uboot/gpio.h index a6a67e3d3..9175cc3d5 100644 --- a/libethdrivers/src/plat/imx6/uboot/gpio.h +++ b/libethdrivers/src/plat/imx6/uboot/gpio.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/imx-regs.h b/libethdrivers/src/plat/imx6/uboot/imx-regs.h index 47bcf1b18..637ea1103 100644 --- a/libethdrivers/src/plat/imx6/uboot/imx-regs.h +++ b/libethdrivers/src/plat/imx6/uboot/imx-regs.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/imx8mq_pins.h b/libethdrivers/src/plat/imx6/uboot/imx8mq_pins.h index ad13d0baa..fa69199fa 100644 --- a/libethdrivers/src/plat/imx6/uboot/imx8mq_pins.h +++ b/libethdrivers/src/plat/imx6/uboot/imx8mq_pins.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/list.h b/libethdrivers/src/plat/imx6/uboot/list.h index f7c18cf40..cd674873f 100644 --- a/libethdrivers/src/plat/imx6/uboot/list.h +++ b/libethdrivers/src/plat/imx6/uboot/list.h @@ -1,5 +1,6 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later + * Copyright Linux */ #pragma once diff --git a/libethdrivers/src/plat/imx6/uboot/mdio.h b/libethdrivers/src/plat/imx6/uboot/mdio.h index 793c91629..5ed64d431 100644 --- a/libethdrivers/src/plat/imx6/uboot/mdio.h +++ b/libethdrivers/src/plat/imx6/uboot/mdio.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/micrel.c b/libethdrivers/src/plat/imx6/uboot/micrel.c index e6f551449..84cee70c7 100644 --- a/libethdrivers/src/plat/imx6/uboot/micrel.c +++ b/libethdrivers/src/plat/imx6/uboot/micrel.c @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/micrel.h b/libethdrivers/src/plat/imx6/uboot/micrel.h index 0512515e0..0a09e08ec 100644 --- a/libethdrivers/src/plat/imx6/uboot/micrel.h +++ b/libethdrivers/src/plat/imx6/uboot/micrel.h @@ -1,5 +1,6 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later + * Copyright Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ #pragma once diff --git a/libethdrivers/src/plat/imx6/uboot/mii.h b/libethdrivers/src/plat/imx6/uboot/mii.h index 5302ad35c..9921a3341 100644 --- a/libethdrivers/src/plat/imx6/uboot/mii.h +++ b/libethdrivers/src/plat/imx6/uboot/mii.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/miiphy.h b/libethdrivers/src/plat/imx6/uboot/miiphy.h index cca3ba07f..d3d38fa3e 100644 --- a/libethdrivers/src/plat/imx6/uboot/miiphy.h +++ b/libethdrivers/src/plat/imx6/uboot/miiphy.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /*----------------------------------------------------------------------------+ diff --git a/libethdrivers/src/plat/imx6/uboot/miiphyutil.c b/libethdrivers/src/plat/imx6/uboot/miiphyutil.c index bc0b76a70..f679ba475 100644 --- a/libethdrivers/src/plat/imx6/uboot/miiphyutil.c +++ b/libethdrivers/src/plat/imx6/uboot/miiphyutil.c @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/mx6qsabrelite.c b/libethdrivers/src/plat/imx6/uboot/mx6qsabrelite.c index f72205640..fce1947fd 100644 --- a/libethdrivers/src/plat/imx6/uboot/mx6qsabrelite.c +++ b/libethdrivers/src/plat/imx6/uboot/mx6qsabrelite.c @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/mx6qsabrelite.h b/libethdrivers/src/plat/imx6/uboot/mx6qsabrelite.h index ba4271da3..f89a8a871 100644 --- a/libethdrivers/src/plat/imx6/uboot/mx6qsabrelite.h +++ b/libethdrivers/src/plat/imx6/uboot/mx6qsabrelite.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/mx6x_pins.h b/libethdrivers/src/plat/imx6/uboot/mx6x_pins.h index dde7ea00d..94801a01a 100644 --- a/libethdrivers/src/plat/imx6/uboot/mx6x_pins.h +++ b/libethdrivers/src/plat/imx6/uboot/mx6x_pins.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/mxc_gpio.c b/libethdrivers/src/plat/imx6/uboot/mxc_gpio.c index 21780b87f..a55c0ffff 100644 --- a/libethdrivers/src/plat/imx6/uboot/mxc_gpio.c +++ b/libethdrivers/src/plat/imx6/uboot/mxc_gpio.c @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/phy.c b/libethdrivers/src/plat/imx6/uboot/phy.c index 2b00bb5b1..cd2afac9a 100644 --- a/libethdrivers/src/plat/imx6/uboot/phy.c +++ b/libethdrivers/src/plat/imx6/uboot/phy.c @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/uboot/phy.h b/libethdrivers/src/plat/imx6/uboot/phy.h index f440070b5..7bdf256a5 100644 --- a/libethdrivers/src/plat/imx6/uboot/phy.h +++ b/libethdrivers/src/plat/imx6/uboot/phy.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/imx6/unimplemented.c b/libethdrivers/src/plat/imx6/unimplemented.c index 2fee8ad53..ad258c2ea 100644 --- a/libethdrivers/src/plat/imx6/unimplemented.c +++ b/libethdrivers/src/plat/imx6/unimplemented.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/plat/imx6/unimplemented.h b/libethdrivers/src/plat/imx6/unimplemented.h index c02c1d1e1..c40cf4159 100644 --- a/libethdrivers/src/plat/imx6/unimplemented.h +++ b/libethdrivers/src/plat/imx6/unimplemented.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/plat/pc99/intel.c b/libethdrivers/src/plat/pc99/intel.c index 2baf420a9..c5f008b4c 100644 --- a/libethdrivers/src/plat/pc99/intel.c +++ b/libethdrivers/src/plat/pc99/intel.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/plat/pc99/virtio_pci.c b/libethdrivers/src/plat/pc99/virtio_pci.c index 942397636..8637a2098 100644 --- a/libethdrivers/src/plat/pc99/virtio_pci.c +++ b/libethdrivers/src/plat/pc99/virtio_pci.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/plat/tx2/io.h b/libethdrivers/src/plat/tx2/io.h index bd83d9aa6..6f0c43faf 100644 --- a/libethdrivers/src/plat/tx2/io.h +++ b/libethdrivers/src/plat/tx2/io.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/plat/tx2/tx2.c b/libethdrivers/src/plat/tx2/tx2.c index 4fd42b6e7..b6f42c855 100644 --- a/libethdrivers/src/plat/tx2/tx2.c +++ b/libethdrivers/src/plat/tx2/tx2.c @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/plat/tx2/tx2.h b/libethdrivers/src/plat/tx2/tx2.h index bd7a5cee6..a2490ad9a 100644 --- a/libethdrivers/src/plat/tx2/tx2.h +++ b/libethdrivers/src/plat/tx2/tx2.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include #include diff --git a/libethdrivers/src/plat/tx2/uboot/common.h b/libethdrivers/src/plat/tx2/uboot/common.h index dd64c14ba..d794101da 100644 --- a/libethdrivers/src/plat/tx2/uboot/common.h +++ b/libethdrivers/src/plat/tx2/uboot/common.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/tx2/uboot/dwc_eth_qos.c b/libethdrivers/src/plat/tx2/uboot/dwc_eth_qos.c index 9af3c8fea..777edecd9 100644 --- a/libethdrivers/src/plat/tx2/uboot/dwc_eth_qos.c +++ b/libethdrivers/src/plat/tx2/uboot/dwc_eth_qos.c @@ -1,7 +1,7 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ -// SPDX-License-Identifier: GPL-2.0 + /* * Copyright (c) 2016, NVIDIA CORPORATION. * diff --git a/libethdrivers/src/plat/tx2/uboot/dwc_eth_qos.h b/libethdrivers/src/plat/tx2/uboot/dwc_eth_qos.h index 20e0098ae..225c609e8 100644 --- a/libethdrivers/src/plat/tx2/uboot/dwc_eth_qos.h +++ b/libethdrivers/src/plat/tx2/uboot/dwc_eth_qos.h @@ -1,7 +1,7 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ -// SPDX-License-Identifier: GPL-2.0 + /* * Copyright (c) 2016, NVIDIA CORPORATION. * diff --git a/libethdrivers/src/plat/tx2/uboot/err.h b/libethdrivers/src/plat/tx2/uboot/err.h index 13e05a9f9..f1e815aa2 100644 --- a/libethdrivers/src/plat/tx2/uboot/err.h +++ b/libethdrivers/src/plat/tx2/uboot/err.h @@ -1,5 +1,6 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only + * Copyright Linux */ #pragma once diff --git a/libethdrivers/src/plat/tx2/uboot/ethtool.h b/libethdrivers/src/plat/tx2/uboot/ethtool.h index 66cc485b2..1fdd90bf7 100644 --- a/libethdrivers/src/plat/tx2/uboot/ethtool.h +++ b/libethdrivers/src/plat/tx2/uboot/ethtool.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/libethdrivers/src/plat/tx2/uboot/list.h b/libethdrivers/src/plat/tx2/uboot/list.h index 7cfb4e98b..1303bc16b 100644 --- a/libethdrivers/src/plat/tx2/uboot/list.h +++ b/libethdrivers/src/plat/tx2/uboot/list.h @@ -1,5 +1,6 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only + * Copyright Linux */ #pragma once diff --git a/libethdrivers/src/plat/tx2/uboot/mdio.h b/libethdrivers/src/plat/tx2/uboot/mdio.h index 3f196febb..182d4430e 100644 --- a/libethdrivers/src/plat/tx2/uboot/mdio.h +++ b/libethdrivers/src/plat/tx2/uboot/mdio.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/libethdrivers/src/plat/tx2/uboot/mii.h b/libethdrivers/src/plat/tx2/uboot/mii.h index 0060a86f7..10e4e122f 100644 --- a/libethdrivers/src/plat/tx2/uboot/mii.h +++ b/libethdrivers/src/plat/tx2/uboot/mii.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/libethdrivers/src/plat/tx2/uboot/miiphy.h b/libethdrivers/src/plat/tx2/uboot/miiphy.h index 5d692fbe1..950919f0d 100644 --- a/libethdrivers/src/plat/tx2/uboot/miiphy.h +++ b/libethdrivers/src/plat/tx2/uboot/miiphy.h @@ -1,7 +1,4 @@ -/* - * @TAG(OTHER_GPL) - */ -/* SPDX-License-Identifier: GPL-2.0 OR IBM-pibs */ +/* SPDX-License-Identifier: GPL-2.0-only OR IBM-pibs */ /* * Additions (C) Copyright 2009 Industrie Dial Face S.p.A. */ diff --git a/libethdrivers/src/plat/tx2/uboot/miiphyutil.c b/libethdrivers/src/plat/tx2/uboot/miiphyutil.c index a99bee0f8..bd6862b71 100644 --- a/libethdrivers/src/plat/tx2/uboot/miiphyutil.c +++ b/libethdrivers/src/plat/tx2/uboot/miiphyutil.c @@ -1,7 +1,7 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ -// SPDX-License-Identifier: GPL-2.0+ + /* * (C) Copyright 2001 * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com. diff --git a/libethdrivers/src/plat/tx2/uboot/net.h b/libethdrivers/src/plat/tx2/uboot/net.h index 1fe2e1ceb..1863f4407 100644 --- a/libethdrivers/src/plat/tx2/uboot/net.h +++ b/libethdrivers/src/plat/tx2/uboot/net.h @@ -1,7 +1,4 @@ -/* - * @TAG(OTHER_GPL) - */ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * LiMon Monitor (LiMon) - Network. * diff --git a/libethdrivers/src/plat/tx2/uboot/phy.c b/libethdrivers/src/plat/tx2/uboot/phy.c index 5f6b95abe..866535905 100644 --- a/libethdrivers/src/plat/tx2/uboot/phy.c +++ b/libethdrivers/src/plat/tx2/uboot/phy.c @@ -1,10 +1,7 @@ -/* - * @TAG(OTHER_GPL) - */ /* * Generic PHY Management code * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Copyright 2011 Freescale Semiconductor, Inc. * author Andy Fleming diff --git a/libethdrivers/src/plat/tx2/uboot/phy.h b/libethdrivers/src/plat/tx2/uboot/phy.h index 918b27ed6..3c832607d 100644 --- a/libethdrivers/src/plat/tx2/uboot/phy.h +++ b/libethdrivers/src/plat/tx2/uboot/phy.h @@ -1,11 +1,8 @@ -/* - * @TAG(OTHER_GPL) - */ /* * Copyright 2011 Freescale Semiconductor, Inc. * Andy Fleming * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * This file pretty much stolen from Linux's mii.h/ethtool.h/phy.h */ diff --git a/libethdrivers/src/plat/tx2/uboot/tx2_configs.h b/libethdrivers/src/plat/tx2/uboot/tx2_configs.h index 5efd2cb7c..d94573ce7 100644 --- a/libethdrivers/src/plat/tx2/uboot/tx2_configs.h +++ b/libethdrivers/src/plat/tx2/uboot/tx2_configs.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/plat/tx2/uboot/wait_bit.h b/libethdrivers/src/plat/tx2/uboot/wait_bit.h index 6395c5c34..968f1562a 100644 --- a/libethdrivers/src/plat/tx2/uboot/wait_bit.h +++ b/libethdrivers/src/plat/tx2/uboot/wait_bit.h @@ -1,7 +1,4 @@ -/* - * @TAG(OTHER_GPL) - */ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Wait for bit with timeout and ctrlc * diff --git a/libethdrivers/src/plat/tx2/unimplemented.c b/libethdrivers/src/plat/tx2/unimplemented.c index 7078d168c..4d1a483cc 100644 --- a/libethdrivers/src/plat/tx2/unimplemented.c +++ b/libethdrivers/src/plat/tx2/unimplemented.c @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/plat/tx2/unimplemented.h b/libethdrivers/src/plat/tx2/unimplemented.h index f484c6931..d95112a60 100644 --- a/libethdrivers/src/plat/tx2/unimplemented.h +++ b/libethdrivers/src/plat/tx2/unimplemented.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libethdrivers/src/plat/zynq7000/io.h b/libethdrivers/src/plat/zynq7000/io.h index 549b8ea19..74395614d 100644 --- a/libethdrivers/src/plat/zynq7000/io.h +++ b/libethdrivers/src/plat/zynq7000/io.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _ETHDRIVER_ZYNQ7000_IO_H_ diff --git a/libethdrivers/src/plat/zynq7000/uboot/bitops.h b/libethdrivers/src/plat/zynq7000/uboot/bitops.h index d620c06fc..13217e471 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/bitops.h +++ b/libethdrivers/src/plat/zynq7000/uboot/bitops.h @@ -1,5 +1,6 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only + * Copyright Linux */ #ifndef _LINUX_BITOPS_H diff --git a/libethdrivers/src/plat/zynq7000/uboot/common.h b/libethdrivers/src/plat/zynq7000/uboot/common.h index 6e0146745..cd292432a 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/common.h +++ b/libethdrivers/src/plat/zynq7000/uboot/common.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/zynq7000/uboot/config.h b/libethdrivers/src/plat/zynq7000/uboot/config.h index e2bf9f6f9..d111a2809 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/config.h +++ b/libethdrivers/src/plat/zynq7000/uboot/config.h @@ -1,5 +1,6 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only + * Copyright Dornerworks */ #include "zynq_zc70x.h" diff --git a/libethdrivers/src/plat/zynq7000/uboot/err.h b/libethdrivers/src/plat/zynq7000/uboot/err.h index e73470a7b..49d35b0a7 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/err.h +++ b/libethdrivers/src/plat/zynq7000/uboot/err.h @@ -1,3 +1,8 @@ +/* + * SPDX-License-Identifier: GPL-2.0-only + * Copyright Linux + */ + #ifndef _LINUX_ERR_H #define _LINUX_ERR_H diff --git a/libethdrivers/src/plat/zynq7000/uboot/ethtool.h b/libethdrivers/src/plat/zynq7000/uboot/ethtool.h index 6c4c44918..faf68b909 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/ethtool.h +++ b/libethdrivers/src/plat/zynq7000/uboot/ethtool.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/libethdrivers/src/plat/zynq7000/uboot/list.h b/libethdrivers/src/plat/zynq7000/uboot/list.h index 8e3cc173b..f007739c9 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/list.h +++ b/libethdrivers/src/plat/zynq7000/uboot/list.h @@ -1,3 +1,8 @@ +/* + * SPDX-License-Identifier: GPL-2.0-only + * Copyright Linux + */ + #ifndef _LINUX_LIST_H #define _LINUX_LIST_H diff --git a/libethdrivers/src/plat/zynq7000/uboot/marvell.c b/libethdrivers/src/plat/zynq7000/uboot/marvell.c index 20a7a9a6d..4964095f5 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/marvell.c +++ b/libethdrivers/src/plat/zynq7000/uboot/marvell.c @@ -1,7 +1,7 @@ /* * Marvell PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming diff --git a/libethdrivers/src/plat/zynq7000/uboot/mdio.h b/libethdrivers/src/plat/zynq7000/uboot/mdio.h index f5439088e..97fe2caa8 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/mdio.h +++ b/libethdrivers/src/plat/zynq7000/uboot/mdio.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/libethdrivers/src/plat/zynq7000/uboot/mii.h b/libethdrivers/src/plat/zynq7000/uboot/mii.h index 5a4ff6431..5e8adf25e 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/mii.h +++ b/libethdrivers/src/plat/zynq7000/uboot/mii.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/libethdrivers/src/plat/zynq7000/uboot/miiphy.h b/libethdrivers/src/plat/zynq7000/uboot/miiphy.h index 48511e5d1..4f3e5d4eb 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/miiphy.h +++ b/libethdrivers/src/plat/zynq7000/uboot/miiphy.h @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ /*----------------------------------------------------------------------------+ diff --git a/libethdrivers/src/plat/zynq7000/uboot/miiphyutil.c b/libethdrivers/src/plat/zynq7000/uboot/miiphyutil.c index dbb73058e..cfb25ac3b 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/miiphyutil.c +++ b/libethdrivers/src/plat/zynq7000/uboot/miiphyutil.c @@ -1,5 +1,5 @@ /* - * @TAG(OTHER_GPL) + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/zynq7000/uboot/net.h b/libethdrivers/src/plat/zynq7000/uboot/net.h index 3602dbaeb..7239f4528 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/net.h +++ b/libethdrivers/src/plat/zynq7000/uboot/net.h @@ -3,7 +3,7 @@ * * Copyright 1994 - 2000 Neil Russell. * (See License) - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0-only * * History * 9/16/00 bor adapted to TQM823L/STK8xxL board, RARP/TFTP boot added diff --git a/libethdrivers/src/plat/zynq7000/uboot/netdev.h b/libethdrivers/src/plat/zynq7000/uboot/netdev.h index 650b617be..b16806f2f 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/netdev.h +++ b/libethdrivers/src/plat/zynq7000/uboot/netdev.h @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Benjamin Warren, biggerbadderben@gmail.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/libethdrivers/src/plat/zynq7000/uboot/phy.c b/libethdrivers/src/plat/zynq7000/uboot/phy.c index 82db66598..c047d44ce 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/phy.c +++ b/libethdrivers/src/plat/zynq7000/uboot/phy.c @@ -1,7 +1,7 @@ /* * Generic PHY Management code * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Copyright 2011 Freescale Semiconductor, Inc. * author Andy Fleming diff --git a/libethdrivers/src/plat/zynq7000/uboot/phy.h b/libethdrivers/src/plat/zynq7000/uboot/phy.h index e8dc85444..16323c3a3 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/phy.h +++ b/libethdrivers/src/plat/zynq7000/uboot/phy.h @@ -2,7 +2,7 @@ * Copyright 2011 Freescale Semiconductor, Inc. * Andy Fleming * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * This file pretty much stolen from Linux's mii.h/ethtool.h/phy.h */ diff --git a/libethdrivers/src/plat/zynq7000/uboot/system.h b/libethdrivers/src/plat/zynq7000/uboot/system.h index e4d6ee442..f71f5749c 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/system.h +++ b/libethdrivers/src/plat/zynq7000/uboot/system.h @@ -1,3 +1,8 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * Copyright Wolfgang Denk, DENX Software Engineering, wd@denx.de. + */ + #ifndef __ASM_ARM_SYSTEM_H #define __ASM_ARM_SYSTEM_H diff --git a/libethdrivers/src/plat/zynq7000/uboot/zynq-common.h b/libethdrivers/src/plat/zynq7000/uboot/zynq-common.h index f5325341e..b6f3dfcf0 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/zynq-common.h +++ b/libethdrivers/src/plat/zynq7000/uboot/zynq-common.h @@ -4,7 +4,7 @@ * * Common configuration options for all Zynq boards. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CONFIG_ZYNQ_COMMON_H diff --git a/libethdrivers/src/plat/zynq7000/uboot/zynq_gem.c b/libethdrivers/src/plat/zynq7000/uboot/zynq_gem.c index be0774db6..0c96a1f08 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/zynq_gem.c +++ b/libethdrivers/src/plat/zynq7000/uboot/zynq_gem.c @@ -9,7 +9,7 @@ * Based on Xilinx gmac driver: * (C) Copyright 2011 Xilinx * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "common.h" diff --git a/libethdrivers/src/plat/zynq7000/uboot/zynq_zc70x.h b/libethdrivers/src/plat/zynq7000/uboot/zynq_zc70x.h index 8180903d9..5c2f21778 100644 --- a/libethdrivers/src/plat/zynq7000/uboot/zynq_zc70x.h +++ b/libethdrivers/src/plat/zynq7000/uboot/zynq_zc70x.h @@ -4,7 +4,7 @@ * Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards * See zynq-common.h for Zynq common configs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CONFIG_ZYNQ_ZC70X_H diff --git a/libethdrivers/src/plat/zynq7000/unimplemented.c b/libethdrivers/src/plat/zynq7000/unimplemented.c index 8ef7b5d81..be3a84a57 100644 --- a/libethdrivers/src/plat/zynq7000/unimplemented.c +++ b/libethdrivers/src/plat/zynq7000/unimplemented.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/libethdrivers/src/plat/zynq7000/unimplemented.h b/libethdrivers/src/plat/zynq7000/unimplemented.h index 4ad0bc33a..8a9238f16 100644 --- a/libethdrivers/src/plat/zynq7000/unimplemented.h +++ b/libethdrivers/src/plat/zynq7000/unimplemented.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef __UNIMPLEMENTED_H__ diff --git a/libethdrivers/src/plat/zynq7000/zynq7000.c b/libethdrivers/src/plat/zynq7000/zynq7000.c index 825fa30ad..0986423fe 100644 --- a/libethdrivers/src/plat/zynq7000/zynq7000.c +++ b/libethdrivers/src/plat/zynq7000/zynq7000.c @@ -1,14 +1,8 @@ /* * Copyright 2017, DornerWorks, Ltd. - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the GNU General Public License version 2. Note that NO WARRANTY is provided. - * See "LICENSE_GPLv2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #include "unimplemented.h" diff --git a/libethdrivers/src/plat/zynq7000/zynq_gem.h b/libethdrivers/src/plat/zynq7000/zynq_gem.h index 174b46e6f..18672ef4f 100644 --- a/libethdrivers/src/plat/zynq7000/zynq_gem.h +++ b/libethdrivers/src/plat/zynq7000/zynq_gem.h @@ -9,7 +9,7 @@ * Based on Xilinx gmac driver: * (C) Copyright 2011 Xilinx * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once diff --git a/libfdt/CMakeLists.txt b/libfdt/CMakeLists.txt index bd571580e..89332c8fb 100644 --- a/libfdt/CMakeLists.txt +++ b/libfdt/CMakeLists.txt @@ -1,12 +1,7 @@ -# Copyright 2019, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. +# Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) # -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.7.2) diff --git a/libfdt/fdt.c b/libfdt/fdt.c index ae03b1112..c75b06fab 100644 --- a/libfdt/fdt.c +++ b/libfdt/fdt.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/fdt.h b/libfdt/fdt.h index 74961f902..aed48598e 100644 --- a/libfdt/fdt.h +++ b/libfdt/fdt.h @@ -1,5 +1,8 @@ #ifndef FDT_H #define FDT_H + +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/fdt_addresses.c b/libfdt/fdt_addresses.c index 49537b578..1eb39b8be 100644 --- a/libfdt/fdt_addresses.c +++ b/libfdt/fdt_addresses.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2014 David Gibson diff --git a/libfdt/fdt_empty_tree.c b/libfdt/fdt_empty_tree.c index f2ae9b77c..296368921 100644 --- a/libfdt/fdt_empty_tree.c +++ b/libfdt/fdt_empty_tree.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2012 David Gibson, IBM Corporation. diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c index 5fdab6c63..766bf7672 100644 --- a/libfdt/fdt_overlay.c +++ b/libfdt/fdt_overlay.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2016 Free Electrons diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index eafc14282..5f69cfd6e 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c index 2e49855d7..2c3483e61 100644 --- a/libfdt/fdt_rw.c +++ b/libfdt/fdt_rw.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/fdt_strerror.c b/libfdt/fdt_strerror.c index 9677a1887..1a73a4f1d 100644 --- a/libfdt/fdt_strerror.c +++ b/libfdt/fdt_strerror.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/fdt_sw.c b/libfdt/fdt_sw.c index 9fa4a94d8..b37a25b02 100644 --- a/libfdt/fdt_sw.c +++ b/libfdt/fdt_sw.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/fdt_wip.c b/libfdt/fdt_wip.c index 534c1cbbb..1a313d0a3 100644 --- a/libfdt/fdt_wip.c +++ b/libfdt/fdt_wip.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/fdtget.c b/libfdt/fdtget.c index ab40b8288..ef0069ab6 100644 --- a/libfdt/fdtget.c +++ b/libfdt/fdtget.c @@ -1,26 +1,28 @@ -/*opyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * Copyright (c) 2011 The Chromium OS Authors. All rights reserved. * - * * Portions from U-Boot cmd_fdt.c (C) Copyright 2007 - * * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com - * * Based on code written by: - * * Pantelis Antoniou and - * * Matthew McClintock - * * - * * This program is free software; you can redistribute it and/or - * * modify it under the terms of the GNU General Public License as - * * published by the Free Software Foundation; either version 2 of - * * the License, or (at your option) any later version. - * * - * * This program is distributed in the hope that it will be useful, - * * but WITHOUT ANY WARRANTY; without even the implied warranty of - * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * * GNU General Public License for more details. - * * - * * You should have received a copy of the GNU General Public License - * * along with this program; if not, write to the Free Software - * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * * MA 02111-1307 USA - * */ + * Portions from U-Boot cmd_fdt.c (C) Copyright 2007 + * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com + * Based on code written by: + * Pantelis Antoniou and + * Matthew McClintock + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ #include #include diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h index 97d2ef225..dfbf689df 100644 --- a/libfdt/libfdt.h +++ b/libfdt/libfdt.h @@ -1,5 +1,8 @@ #ifndef LIBFDT_H #define LIBFDT_H + +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h index eb2053845..3a3823940 100644 --- a/libfdt/libfdt_env.h +++ b/libfdt/libfdt_env.h @@ -1,5 +1,8 @@ #ifndef LIBFDT_ENV_H #define LIBFDT_ENV_H + +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/libfdt/libfdt_internal.h b/libfdt/libfdt_internal.h index 4109f890a..9eb9fd1e5 100644 --- a/libfdt/libfdt_internal.h +++ b/libfdt/libfdt_internal.h @@ -1,5 +1,8 @@ #ifndef LIBFDT_INTERNAL_H #define LIBFDT_INTERNAL_H + +/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-2-Clause */ + /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. diff --git a/liblwip/CMakeLists.txt b/liblwip/CMakeLists.txt index 21fdf3646..5ea6b0593 100644 --- a/liblwip/CMakeLists.txt +++ b/liblwip/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2020, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.8.2) diff --git a/liblwip/default_opts/lwipopts.h b/liblwip/default_opts/lwipopts.h index bd6cb9eca..68ade1427 100644 --- a/liblwip/default_opts/lwipopts.h +++ b/liblwip/default_opts/lwipopts.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + /* * Copyright (c) 2001-2003 Swedish Institute of Computer Science. * All rights reserved. diff --git a/liblwip/include/arch/perf.h b/liblwip/include/arch/perf.h index 100d120ad..2f0aa99dd 100644 --- a/liblwip/include/arch/perf.h +++ b/liblwip/include/arch/perf.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + /* * Copyright (c) 2001-2003 Swedish Institute of Computer Science. * All rights reserved. diff --git a/liblwip/include/lwip/arch/cc.h b/liblwip/include/lwip/arch/cc.h index 4edbfa064..abd99fa6b 100644 --- a/liblwip/include/lwip/arch/cc.h +++ b/liblwip/include/lwip/arch/cc.h @@ -1,3 +1,8 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2001-2003 Swedish Institute of Computer Science. + */ + #include typedef uint8_t u8_t; diff --git a/liblwip/lwip_helpers.cmake b/liblwip/lwip_helpers.cmake index 5be42982d..77cafd5eb 100644 --- a/liblwip/lwip_helpers.cmake +++ b/liblwip/lwip_helpers.cmake @@ -1,13 +1,7 @@ # -# Copyright 2018, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.8.2) diff --git a/libpci/CMakeLists.txt b/libpci/CMakeLists.txt index 45ffaf4f8..0b23adae8 100644 --- a/libpci/CMakeLists.txt +++ b/libpci/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2018, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.7.2) diff --git a/libpci/include/pci/helper.h b/libpci/include/pci/helper.h index 77e2cabd1..b52a75420 100644 --- a/libpci/include/pci/helper.h +++ b/libpci/include/pci/helper.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libpci/include/pci/helper_gen.py b/libpci/include/pci/helper_gen.py index db9a208b5..eb7ec032f 100755 --- a/libpci/include/pci/helper_gen.py +++ b/libpci/include/pci/helper_gen.py @@ -2,11 +2,7 @@ # # Copyright 2014, NICTA # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # import re, os; diff --git a/libpci/include/pci/ioreg.h b/libpci/include/pci/ioreg.h index 0479034fc..6645eff70 100644 --- a/libpci/include/pci/ioreg.h +++ b/libpci/include/pci/ioreg.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libpci/include/pci/pci.h b/libpci/include/pci/pci.h index 590bf932e..26542d54c 100644 --- a/libpci/include/pci/pci.h +++ b/libpci/include/pci/pci.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libpci/include/pci/pci_config.h b/libpci/include/pci/pci_config.h index f895e0d4f..43858e1a5 100644 --- a/libpci/include/pci/pci_config.h +++ b/libpci/include/pci/pci_config.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libpci/include/pci/virtual_device.h b/libpci/include/pci/virtual_device.h index 21b0375cd..f2be9afd8 100644 --- a/libpci/include/pci/virtual_device.h +++ b/libpci/include/pci/virtual_device.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Virtual PCI devices - allows rebasing base addresses. diff --git a/libpci/include/pci/virtual_pci.h b/libpci/include/pci/virtual_pci.h index 97207fa4c..68e4b0a73 100644 --- a/libpci/include/pci/virtual_pci.h +++ b/libpci/include/pci/virtual_pci.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libpci/src/helper.c b/libpci/src/helper.c index 2eb24b1ba..5344b58ac 100644 --- a/libpci/src/helper.c +++ b/libpci/src/helper.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ // WARNING: This file is generated. DO NOT EDIT. diff --git a/libpci/src/ioreg.c b/libpci/src/ioreg.c index 958683eff..0010c9147 100644 --- a/libpci/src/ioreg.c +++ b/libpci/src/ioreg.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libpci/src/pci.c b/libpci/src/pci.c index c8ced63ce..6f118af55 100644 --- a/libpci/src/pci.c +++ b/libpci/src/pci.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libpci/src/virtual_device.c b/libpci/src/virtual_device.c index 039681435..061993f5e 100644 --- a/libpci/src/virtual_device.c +++ b/libpci/src/virtual_device.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libpci/src/virtual_pci.c b/libpci/src/virtual_pci.c index 7369510a9..00784106f 100644 --- a/libpci/src/virtual_pci.c +++ b/libpci/src/virtual_pci.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libpicotcp/CMakeLists.txt b/libpicotcp/CMakeLists.txt index f396fe521..1671b1acb 100644 --- a/libpicotcp/CMakeLists.txt +++ b/libpicotcp/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2018, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.7.2) diff --git a/libpicotcp/picoopts.h b/libpicotcp/picoopts.h index 43f19bcde..ec6cdde5d 100644 --- a/libpicotcp/picoopts.h +++ b/libpicotcp/picoopts.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* PicoTCP - Definition file to add support for modules */ diff --git a/libplatsupport/CMakeLists.txt b/libplatsupport/CMakeLists.txt index 646b0fb86..95eabe7fa 100644 --- a/libplatsupport/CMakeLists.txt +++ b/libplatsupport/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2017, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.7.2) diff --git a/libplatsupport/LICENSE_BSD2.txt b/libplatsupport/LICENSE_BSD2.txt deleted file mode 100644 index 982302060..000000000 --- a/libplatsupport/LICENSE_BSD2.txt +++ /dev/null @@ -1,30 +0,0 @@ -Files described as being under the "BSD 2-Clause" license fall under the -following license. - ------------------------------------------------------------------------ - -Copyright (c) 2014 National ICT Australia and other contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/libplatsupport/README.md b/libplatsupport/README.md index 01baceb99..220a2ef00 100644 --- a/libplatsupport/README.md +++ b/libplatsupport/README.md @@ -1,14 +1,9 @@ + seL4 libplatsupport -------------------- diff --git a/libplatsupport/arch_include/arm/platsupport/arch/generic_timer.h b/libplatsupport/arch_include/arm/platsupport/arch/generic_timer.h index 37ab1ad6f..816fe6a9d 100644 --- a/libplatsupport/arch_include/arm/platsupport/arch/generic_timer.h +++ b/libplatsupport/arch_include/arm/platsupport/arch/generic_timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/clock.h b/libplatsupport/arch_include/arm/platsupport/clock.h index a482e5bd7..2e6b33309 100644 --- a/libplatsupport/arch_include/arm/platsupport/clock.h +++ b/libplatsupport/arch_include/arm/platsupport/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/dma330.h b/libplatsupport/arch_include/arm/platsupport/dma330.h index a8051bbb9..41d47ee88 100644 --- a/libplatsupport/arch_include/arm/platsupport/dma330.h +++ b/libplatsupport/arch_include/arm/platsupport/dma330.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/gpio.h b/libplatsupport/arch_include/arm/platsupport/gpio.h index 8ef1cddcb..c4db66fa6 100644 --- a/libplatsupport/arch_include/arm/platsupport/gpio.h +++ b/libplatsupport/arch_include/arm/platsupport/gpio.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/gpio_utils.h b/libplatsupport/arch_include/arm/platsupport/gpio_utils.h index 121b4c1cb..e717012b2 100644 --- a/libplatsupport/arch_include/arm/platsupport/gpio_utils.h +++ b/libplatsupport/arch_include/arm/platsupport/gpio_utils.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/i2c.h b/libplatsupport/arch_include/arm/platsupport/i2c.h index f395e96f9..4d0be2472 100644 --- a/libplatsupport/arch_include/arm/platsupport/i2c.h +++ b/libplatsupport/arch_include/arm/platsupport/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/irq_combiner.h b/libplatsupport/arch_include/arm/platsupport/irq_combiner.h index 14dfb008e..97c121ec5 100644 --- a/libplatsupport/arch_include/arm/platsupport/irq_combiner.h +++ b/libplatsupport/arch_include/arm/platsupport/irq_combiner.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/mux.h b/libplatsupport/arch_include/arm/platsupport/mux.h index e25993e59..bf904b5b1 100644 --- a/libplatsupport/arch_include/arm/platsupport/mux.h +++ b/libplatsupport/arch_include/arm/platsupport/mux.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/reset.h b/libplatsupport/arch_include/arm/platsupport/reset.h index 2948ef21b..f6960c14a 100644 --- a/libplatsupport/arch_include/arm/platsupport/reset.h +++ b/libplatsupport/arch_include/arm/platsupport/reset.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/spi.h b/libplatsupport/arch_include/arm/platsupport/spi.h index 258d690df..6ab0e1d69 100644 --- a/libplatsupport/arch_include/arm/platsupport/spi.h +++ b/libplatsupport/arch_include/arm/platsupport/spi.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/arm/platsupport/src.h b/libplatsupport/arch_include/arm/platsupport/src.h index 41155ac15..301a0919a 100644 --- a/libplatsupport/arch_include/arm/platsupport/src.h +++ b/libplatsupport/arch_include/arm/platsupport/src.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/arch_include/x86/platsupport/arch/tsc.h b/libplatsupport/arch_include/x86/platsupport/arch/tsc.h index 623428198..3141649ad 100644 --- a/libplatsupport/arch_include/x86/platsupport/arch/tsc.h +++ b/libplatsupport/arch_include/x86/platsupport/arch/tsc.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/docs/driver_environment/index.md b/libplatsupport/docs/driver_environment/index.md index 8f060837e..e317f8308 100644 --- a/libplatsupport/docs/driver_environment/index.md +++ b/libplatsupport/docs/driver_environment/index.md @@ -1,9 +1,7 @@ # Driver environment diff --git a/libplatsupport/docs/driver_environment/ps_dma_man_t.md b/libplatsupport/docs/driver_environment/ps_dma_man_t.md index d147f6cbf..a8e0cae43 100644 --- a/libplatsupport/docs/driver_environment/ps_dma_man_t.md +++ b/libplatsupport/docs/driver_environment/ps_dma_man_t.md @@ -1,9 +1,7 @@ # Direct Memory Access (DMA) management interface diff --git a/libplatsupport/docs/driver_environment/ps_interface_registration_ops_t.md b/libplatsupport/docs/driver_environment/ps_interface_registration_ops_t.md index 7c16b00d8..7540d5def 100644 --- a/libplatsupport/docs/driver_environment/ps_interface_registration_ops_t.md +++ b/libplatsupport/docs/driver_environment/ps_interface_registration_ops_t.md @@ -1,9 +1,7 @@ # Interface registration interface diff --git a/libplatsupport/docs/driver_environment/ps_io_fdt_t.md b/libplatsupport/docs/driver_environment/ps_io_fdt_t.md index b76c3b4ec..8e340c9af 100644 --- a/libplatsupport/docs/driver_environment/ps_io_fdt_t.md +++ b/libplatsupport/docs/driver_environment/ps_io_fdt_t.md @@ -1,9 +1,7 @@ # FDT interface diff --git a/libplatsupport/docs/driver_environment/ps_io_mapper_t.md b/libplatsupport/docs/driver_environment/ps_io_mapper_t.md index cb2c6773a..09c808c18 100644 --- a/libplatsupport/docs/driver_environment/ps_io_mapper_t.md +++ b/libplatsupport/docs/driver_environment/ps_io_mapper_t.md @@ -1,9 +1,7 @@ # Memory Mapped I/O interface diff --git a/libplatsupport/docs/driver_environment/ps_io_port_ops_t.md b/libplatsupport/docs/driver_environment/ps_io_port_ops_t.md index 9f8ff4277..9bddde903 100644 --- a/libplatsupport/docs/driver_environment/ps_io_port_ops_t.md +++ b/libplatsupport/docs/driver_environment/ps_io_port_ops_t.md @@ -1,9 +1,7 @@ # Architectural I/O operations diff --git a/libplatsupport/docs/driver_environment/ps_irq_ops_t.md b/libplatsupport/docs/driver_environment/ps_irq_ops_t.md index 78b623b32..467bbea68 100644 --- a/libplatsupport/docs/driver_environment/ps_irq_ops_t.md +++ b/libplatsupport/docs/driver_environment/ps_irq_ops_t.md @@ -1,9 +1,7 @@ # Interrupt handling interface diff --git a/libplatsupport/docs/driver_environment/ps_malloc_ops_t.md b/libplatsupport/docs/driver_environment/ps_malloc_ops_t.md index 49c2c3a82..e5efd8e8c 100644 --- a/libplatsupport/docs/driver_environment/ps_malloc_ops_t.md +++ b/libplatsupport/docs/driver_environment/ps_malloc_ops_t.md @@ -1,9 +1,7 @@ # Memory allocation interface diff --git a/libplatsupport/docs/index.md b/libplatsupport/docs/index.md index c0eeb132f..4f39b009d 100644 --- a/libplatsupport/docs/index.md +++ b/libplatsupport/docs/index.md @@ -1,9 +1,7 @@ # libplatsupport diff --git a/libplatsupport/include/platsupport/chardev.h b/libplatsupport/include/platsupport/chardev.h index a46e1a6e0..28085f8c7 100644 --- a/libplatsupport/include/platsupport/chardev.h +++ b/libplatsupport/include/platsupport/chardev.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/delay.h b/libplatsupport/include/platsupport/delay.h index ac6659a88..d35d218d9 100644 --- a/libplatsupport/include/platsupport/delay.h +++ b/libplatsupport/include/platsupport/delay.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/driver_module.h b/libplatsupport/include/platsupport/driver_module.h index 68174405b..1e9ae0a4b 100644 --- a/libplatsupport/include/platsupport/driver_module.h +++ b/libplatsupport/include/platsupport/driver_module.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/fdt.h b/libplatsupport/include/platsupport/fdt.h index 06814ddf3..6060b6e11 100644 --- a/libplatsupport/include/platsupport/fdt.h +++ b/libplatsupport/include/platsupport/fdt.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/interface_registration.h b/libplatsupport/include/platsupport/interface_registration.h index 6a4a03bec..ec938be24 100644 --- a/libplatsupport/include/platsupport/interface_registration.h +++ b/libplatsupport/include/platsupport/interface_registration.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/interface_types.h b/libplatsupport/include/platsupport/interface_types.h index 1c1c8382e..6199d4709 100644 --- a/libplatsupport/include/platsupport/interface_types.h +++ b/libplatsupport/include/platsupport/interface_types.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/io.h b/libplatsupport/include/platsupport/io.h index 252d8ac43..0addcd98d 100644 --- a/libplatsupport/include/platsupport/io.h +++ b/libplatsupport/include/platsupport/io.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/irq.h b/libplatsupport/include/platsupport/irq.h index e0c1d0030..8119b9d10 100644 --- a/libplatsupport/include/platsupport/irq.h +++ b/libplatsupport/include/platsupport/irq.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/local_time_manager.h b/libplatsupport/include/platsupport/local_time_manager.h index 0bf2a031c..0ab534f44 100644 --- a/libplatsupport/include/platsupport/local_time_manager.h +++ b/libplatsupport/include/platsupport/local_time_manager.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/ltimer.h b/libplatsupport/include/platsupport/ltimer.h index 537b011cb..6525412ef 100644 --- a/libplatsupport/include/platsupport/ltimer.h +++ b/libplatsupport/include/platsupport/ltimer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/pmem.h b/libplatsupport/include/platsupport/pmem.h index 0b1a6038f..f1f3913eb 100644 --- a/libplatsupport/include/platsupport/pmem.h +++ b/libplatsupport/include/platsupport/pmem.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/serial.h b/libplatsupport/include/platsupport/serial.h index 774b5f136..aaee340cb 100644 --- a/libplatsupport/include/platsupport/serial.h +++ b/libplatsupport/include/platsupport/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/sync/atomic.h b/libplatsupport/include/platsupport/sync/atomic.h index c1575b868..f5949d7b4 100644 --- a/libplatsupport/include/platsupport/sync/atomic.h +++ b/libplatsupport/include/platsupport/sync/atomic.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/sync/spinlock.h b/libplatsupport/include/platsupport/sync/spinlock.h index 2da1572e5..71b6be29e 100644 --- a/libplatsupport/include/platsupport/sync/spinlock.h +++ b/libplatsupport/include/platsupport/sync/spinlock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/sync/sync.h b/libplatsupport/include/platsupport/sync/sync.h index 9099a8d53..5e3348189 100644 --- a/libplatsupport/include/platsupport/sync/sync.h +++ b/libplatsupport/include/platsupport/sync/sync.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/time_manager.h b/libplatsupport/include/platsupport/time_manager.h index a76b84847..888f51f44 100644 --- a/libplatsupport/include/platsupport/time_manager.h +++ b/libplatsupport/include/platsupport/time_manager.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/timer.h b/libplatsupport/include/platsupport/timer.h index 6632bc6bc..e06254c76 100644 --- a/libplatsupport/include/platsupport/timer.h +++ b/libplatsupport/include/platsupport/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/tmu.h b/libplatsupport/include/platsupport/tmu.h index 6ccb2b237..ff4a3e9b9 100644 --- a/libplatsupport/include/platsupport/tmu.h +++ b/libplatsupport/include/platsupport/tmu.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/include/platsupport/tqueue.h b/libplatsupport/include/platsupport/tqueue.h index e54839aec..738bea63d 100644 --- a/libplatsupport/include/platsupport/tqueue.h +++ b/libplatsupport/include/platsupport/tqueue.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/exynos/platsupport/mach/pmic.h b/libplatsupport/mach_include/exynos/platsupport/mach/pmic.h index 74794eea1..de86454cb 100644 --- a/libplatsupport/mach_include/exynos/platsupport/mach/pmic.h +++ b/libplatsupport/mach_include/exynos/platsupport/mach/pmic.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/exynos/platsupport/mach/pmic_rtc.h b/libplatsupport/mach_include/exynos/platsupport/mach/pmic_rtc.h index 91cbaa0ab..13bbc493b 100644 --- a/libplatsupport/mach_include/exynos/platsupport/mach/pmic_rtc.h +++ b/libplatsupport/mach_include/exynos/platsupport/mach/pmic_rtc.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/exynos/platsupport/mach/pwm.h b/libplatsupport/mach_include/exynos/platsupport/mach/pwm.h index 8f862a437..557773ae6 100644 --- a/libplatsupport/mach_include/exynos/platsupport/mach/pwm.h +++ b/libplatsupport/mach_include/exynos/platsupport/mach/pwm.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/exynos/platsupport/mach/serial.h b/libplatsupport/mach_include/exynos/platsupport/mach/serial.h index 5aaea802a..13f3a5113 100644 --- a/libplatsupport/mach_include/exynos/platsupport/mach/serial.h +++ b/libplatsupport/mach_include/exynos/platsupport/mach/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/exynos/platsupport/mach/tmu.h b/libplatsupport/mach_include/exynos/platsupport/mach/tmu.h index 9f31b4bb7..cf7855eaa 100644 --- a/libplatsupport/mach_include/exynos/platsupport/mach/tmu.h +++ b/libplatsupport/mach_include/exynos/platsupport/mach/tmu.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/imx/platsupport/mach/epit.h b/libplatsupport/mach_include/imx/platsupport/mach/epit.h index 97fe14bb1..44bbcd12f 100644 --- a/libplatsupport/mach_include/imx/platsupport/mach/epit.h +++ b/libplatsupport/mach_include/imx/platsupport/mach/epit.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/imx/platsupport/mach/gpt.h b/libplatsupport/mach_include/imx/platsupport/mach/gpt.h index f9a18e0ab..600ebc50a 100644 --- a/libplatsupport/mach_include/imx/platsupport/mach/gpt.h +++ b/libplatsupport/mach_include/imx/platsupport/mach/gpt.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/imx/platsupport/mach/serial.h b/libplatsupport/mach_include/imx/platsupport/mach/serial.h index b8b250f56..034cd7ba6 100644 --- a/libplatsupport/mach_include/imx/platsupport/mach/serial.h +++ b/libplatsupport/mach_include/imx/platsupport/mach/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/nvidia/platsupport/mach/serial.h b/libplatsupport/mach_include/nvidia/platsupport/mach/serial.h index a243e4ca5..bdd991e7b 100644 --- a/libplatsupport/mach_include/nvidia/platsupport/mach/serial.h +++ b/libplatsupport/mach_include/nvidia/platsupport/mach/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once #include diff --git a/libplatsupport/mach_include/nvidia/platsupport/mach/serial_tk1_tx1_defs.h b/libplatsupport/mach_include/nvidia/platsupport/mach/serial_tk1_tx1_defs.h index 031e2112a..d1bc947e8 100644 --- a/libplatsupport/mach_include/nvidia/platsupport/mach/serial_tk1_tx1_defs.h +++ b/libplatsupport/mach_include/nvidia/platsupport/mach/serial_tk1_tx1_defs.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/nvidia/platsupport/mach/timer.h b/libplatsupport/mach_include/nvidia/platsupport/mach/timer.h index b30feae47..28bb499b4 100644 --- a/libplatsupport/mach_include/nvidia/platsupport/mach/timer.h +++ b/libplatsupport/mach_include/nvidia/platsupport/mach/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/nvidia/platsupport/mach/timer_tk1_tx1_defs.h b/libplatsupport/mach_include/nvidia/platsupport/mach/timer_tk1_tx1_defs.h index 4b456ad80..7d7d6ce8c 100644 --- a/libplatsupport/mach_include/nvidia/platsupport/mach/timer_tk1_tx1_defs.h +++ b/libplatsupport/mach_include/nvidia/platsupport/mach/timer_tk1_tx1_defs.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/omap/platsupport/mach/gpt.h b/libplatsupport/mach_include/omap/platsupport/mach/gpt.h index 583d36a09..95a42c120 100644 --- a/libplatsupport/mach_include/omap/platsupport/mach/gpt.h +++ b/libplatsupport/mach_include/omap/platsupport/mach/gpt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/zynq/platsupport/mach/axi_uartlite.h b/libplatsupport/mach_include/zynq/platsupport/mach/axi_uartlite.h index 4cd37fe81..c59fab0a1 100644 --- a/libplatsupport/mach_include/zynq/platsupport/mach/axi_uartlite.h +++ b/libplatsupport/mach_include/zynq/platsupport/mach/axi_uartlite.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ int axi_uartlite_init(void* vaddr, ps_chardevice_t *dev); diff --git a/libplatsupport/mach_include/zynq/platsupport/mach/gpio.h b/libplatsupport/mach_include/zynq/platsupport/mach/gpio.h index 942a059c4..c8f397276 100644 --- a/libplatsupport/mach_include/zynq/platsupport/mach/gpio.h +++ b/libplatsupport/mach_include/zynq/platsupport/mach/gpio.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/zynq/platsupport/mach/i2c.h b/libplatsupport/mach_include/zynq/platsupport/mach/i2c.h index 781b762ca..4aeade1fc 100644 --- a/libplatsupport/mach_include/zynq/platsupport/mach/i2c.h +++ b/libplatsupport/mach_include/zynq/platsupport/mach/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/zynq/platsupport/mach/mux.h b/libplatsupport/mach_include/zynq/platsupport/mach/mux.h index b687b7e38..daacdbfc1 100644 --- a/libplatsupport/mach_include/zynq/platsupport/mach/mux.h +++ b/libplatsupport/mach_include/zynq/platsupport/mach/mux.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/mach_include/zynq/platsupport/mach/timer.h b/libplatsupport/mach_include/zynq/platsupport/mach/timer.h index 18f376c05..04ee02761 100644 --- a/libplatsupport/mach_include/zynq/platsupport/mach/timer.h +++ b/libplatsupport/mach_include/zynq/platsupport/mach/timer.h @@ -1,15 +1,10 @@ /* * Copyright 2017, DornerWorks - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_DORNERWORKS_BSD) + * SPDX-License-Identifier: GPL-2.0-only */ + /* * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under * a DARPA SBIR, Contract Number D16PC00107. diff --git a/libplatsupport/plat_include/am335x/platsupport/plat/clock.h b/libplatsupport/plat_include/am335x/platsupport/plat/clock.h index 4a212a1b3..072a13ddd 100644 --- a/libplatsupport/plat_include/am335x/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/am335x/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/am335x/platsupport/plat/i2c.h b/libplatsupport/plat_include/am335x/platsupport/plat/i2c.h index 922361491..5711a3bbb 100644 --- a/libplatsupport/plat_include/am335x/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/am335x/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/am335x/platsupport/plat/serial.h b/libplatsupport/plat_include/am335x/platsupport/plat/serial.h index dc9e334b3..0ddb632d2 100644 --- a/libplatsupport/plat_include/am335x/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/am335x/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/am335x/platsupport/plat/timer.h b/libplatsupport/plat_include/am335x/platsupport/plat/timer.h index f55aa53d8..79fa130d8 100644 --- a/libplatsupport/plat_include/am335x/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/am335x/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/apq8064/platsupport/plat/clock.h b/libplatsupport/plat_include/apq8064/platsupport/plat/clock.h index c318e6c86..3b608a6da 100644 --- a/libplatsupport/plat_include/apq8064/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/apq8064/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/apq8064/platsupport/plat/i2c.h b/libplatsupport/plat_include/apq8064/platsupport/plat/i2c.h index 14b63ec05..40efe17b5 100644 --- a/libplatsupport/plat_include/apq8064/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/apq8064/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/apq8064/platsupport/plat/serial.h b/libplatsupport/plat_include/apq8064/platsupport/plat/serial.h index d2342d233..345ec031f 100644 --- a/libplatsupport/plat_include/apq8064/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/apq8064/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/apq8064/platsupport/plat/timer.h b/libplatsupport/plat_include/apq8064/platsupport/plat/timer.h index 3865beee9..b9c282c6e 100644 --- a/libplatsupport/plat_include/apq8064/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/apq8064/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* @AUTHOR(akroh@ertos.nicta.com.au) */ diff --git a/libplatsupport/plat_include/ariane/platsupport/plat/serial.h b/libplatsupport/plat_include/ariane/platsupport/plat/serial.h index 60d05034e..6656a5f3a 100644 --- a/libplatsupport/plat_include/ariane/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/ariane/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/bcm2837/platsupport/plat/clock.h b/libplatsupport/plat_include/bcm2837/platsupport/plat/clock.h index ed88f6864..6388d80dd 100644 --- a/libplatsupport/plat_include/bcm2837/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/bcm2837/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/bcm2837/platsupport/plat/i2c.h b/libplatsupport/plat_include/bcm2837/platsupport/plat/i2c.h index c7871b497..b34034981 100644 --- a/libplatsupport/plat_include/bcm2837/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/bcm2837/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/bcm2837/platsupport/plat/serial.h b/libplatsupport/plat_include/bcm2837/platsupport/plat/serial.h index c62a7b8b0..003cbc522 100644 --- a/libplatsupport/plat_include/bcm2837/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/bcm2837/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/bcm2837/platsupport/plat/spt.h b/libplatsupport/plat_include/bcm2837/platsupport/plat/spt.h index 38a6eb20f..30f82c535 100644 --- a/libplatsupport/plat_include/bcm2837/platsupport/plat/spt.h +++ b/libplatsupport/plat_include/bcm2837/platsupport/plat/spt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/bcm2837/platsupport/plat/system_timer.h b/libplatsupport/plat_include/bcm2837/platsupport/plat/system_timer.h index bf6041512..54ae5a62d 100644 --- a/libplatsupport/plat_include/bcm2837/platsupport/plat/system_timer.h +++ b/libplatsupport/plat_include/bcm2837/platsupport/plat/system_timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/clock.h b/libplatsupport/plat_include/exynos4/platsupport/plat/clock.h index 68cc661cf..3a755b662 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/dma330.h b/libplatsupport/plat_include/exynos4/platsupport/plat/dma330.h index 9fc87ec7d..bfe040d6f 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/dma330.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/dma330.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/gpio.h b/libplatsupport/plat_include/exynos4/platsupport/plat/gpio.h index 5925c1f4b..f7f2d3a8d 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/gpio.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/gpio.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/i2c.h b/libplatsupport/plat_include/exynos4/platsupport/plat/i2c.h index 728e1e3e5..25b6b4bfc 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/irq_combiner.h b/libplatsupport/plat_include/exynos4/platsupport/plat/irq_combiner.h index c4892a17f..a7e6ba83d 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/irq_combiner.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/irq_combiner.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/mux.h b/libplatsupport/plat_include/exynos4/platsupport/plat/mux.h index 91f6e94ce..85b0f7e92 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/mux.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/mux.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/pmic.h b/libplatsupport/plat_include/exynos4/platsupport/plat/pmic.h index 8f00c6232..d52cb0b90 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/pmic.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/pmic.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/pwm.h b/libplatsupport/plat_include/exynos4/platsupport/plat/pwm.h index 5eed19469..87d2a9e2f 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/pwm.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/pwm.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/serial.h b/libplatsupport/plat_include/exynos4/platsupport/plat/serial.h index 41ab25be4..bc57ffe92 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/spi.h b/libplatsupport/plat_include/exynos4/platsupport/plat/spi.h index 9623640bb..01a7053a3 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/spi.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/spi.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/src.h b/libplatsupport/plat_include/exynos4/platsupport/plat/src.h index ce9a1282d..aff813843 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/src.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/src.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos4/platsupport/plat/tmu.h b/libplatsupport/plat_include/exynos4/platsupport/plat/tmu.h index 19bcd7e79..5ae5c771a 100644 --- a/libplatsupport/plat_include/exynos4/platsupport/plat/tmu.h +++ b/libplatsupport/plat_include/exynos4/platsupport/plat/tmu.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/clock.h b/libplatsupport/plat_include/exynos5/platsupport/plat/clock.h index fda44b637..5555724e6 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/dma330.h b/libplatsupport/plat_include/exynos5/platsupport/plat/dma330.h index a643bdb1d..e8e0f46c3 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/dma330.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/dma330.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/gpio.h b/libplatsupport/plat_include/exynos5/platsupport/plat/gpio.h index 3c50eb55a..9aa14ee2c 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/gpio.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/gpio.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/i2c.h b/libplatsupport/plat_include/exynos5/platsupport/plat/i2c.h index 2104830e6..9ecfa3ad9 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/irq_combiner.h b/libplatsupport/plat_include/exynos5/platsupport/plat/irq_combiner.h index 9e6c16bab..0203a65ed 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/irq_combiner.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/irq_combiner.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/mux.h b/libplatsupport/plat_include/exynos5/platsupport/plat/mux.h index 7f600a2b8..016217f05 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/mux.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/mux.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/pmic.h b/libplatsupport/plat_include/exynos5/platsupport/plat/pmic.h index dce9734a0..bf4b75039 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/pmic.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/pmic.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/pwm.h b/libplatsupport/plat_include/exynos5/platsupport/plat/pwm.h index b0fd3ae7e..0281d5240 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/pwm.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/pwm.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/rtc.h b/libplatsupport/plat_include/exynos5/platsupport/plat/rtc.h index fc6512304..4e7437b41 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/rtc.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/rtc.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/serial.h b/libplatsupport/plat_include/exynos5/platsupport/plat/serial.h index c35495b99..274d6711a 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/spi.h b/libplatsupport/plat_include/exynos5/platsupport/plat/spi.h index a725a2934..800cc0b02 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/spi.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/spi.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/sysreg.h b/libplatsupport/plat_include/exynos5/platsupport/plat/sysreg.h index 9c6a037ce..436acd5fa 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/sysreg.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/sysreg.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/timer.h b/libplatsupport/plat_include/exynos5/platsupport/plat/timer.h index 7213c409e..987ca2134 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/exynos5/platsupport/plat/tmu.h b/libplatsupport/plat_include/exynos5/platsupport/plat/tmu.h index 39e8cdb66..99dd13ff9 100644 --- a/libplatsupport/plat_include/exynos5/platsupport/plat/tmu.h +++ b/libplatsupport/plat_include/exynos5/platsupport/plat/tmu.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/fvp/platsupport/plat/clock.h b/libplatsupport/plat_include/fvp/platsupport/plat/clock.h index fd1db89d7..568ba6fc0 100644 --- a/libplatsupport/plat_include/fvp/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/fvp/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/fvp/platsupport/plat/i2c.h b/libplatsupport/plat_include/fvp/platsupport/plat/i2c.h index a9d5020cf..bb3269ba0 100644 --- a/libplatsupport/plat_include/fvp/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/fvp/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/fvp/platsupport/plat/serial.h b/libplatsupport/plat_include/fvp/platsupport/plat/serial.h index d3067ae45..5b3bdbca3 100644 --- a/libplatsupport/plat_include/fvp/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/fvp/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/fvp/platsupport/plat/sp804.h b/libplatsupport/plat_include/fvp/platsupport/plat/sp804.h index 056aff4a7..89b3d6289 100644 --- a/libplatsupport/plat_include/fvp/platsupport/plat/sp804.h +++ b/libplatsupport/plat_include/fvp/platsupport/plat/sp804.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/hifive/platsupport/plat/pwm.h b/libplatsupport/plat_include/hifive/platsupport/plat/pwm.h index 6ee8f3af8..de3c16ca1 100644 --- a/libplatsupport/plat_include/hifive/platsupport/plat/pwm.h +++ b/libplatsupport/plat_include/hifive/platsupport/plat/pwm.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/hifive/platsupport/plat/serial.h b/libplatsupport/plat_include/hifive/platsupport/plat/serial.h index f6b3e5d85..68acbc678 100644 --- a/libplatsupport/plat_include/hifive/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/hifive/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/hikey/platsupport/plat/clock.h b/libplatsupport/plat_include/hikey/platsupport/plat/clock.h index 4a212a1b3..072a13ddd 100644 --- a/libplatsupport/plat_include/hikey/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/hikey/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/hikey/platsupport/plat/dmt.h b/libplatsupport/plat_include/hikey/platsupport/plat/dmt.h index f59c1eecc..d39c7b2d7 100644 --- a/libplatsupport/plat_include/hikey/platsupport/plat/dmt.h +++ b/libplatsupport/plat_include/hikey/platsupport/plat/dmt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/hikey/platsupport/plat/i2c.h b/libplatsupport/plat_include/hikey/platsupport/plat/i2c.h index 14b63ec05..40efe17b5 100644 --- a/libplatsupport/plat_include/hikey/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/hikey/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/hikey/platsupport/plat/rtc.h b/libplatsupport/plat_include/hikey/platsupport/plat/rtc.h index b8f04fe62..e1f59e1a0 100644 --- a/libplatsupport/plat_include/hikey/platsupport/plat/rtc.h +++ b/libplatsupport/plat_include/hikey/platsupport/plat/rtc.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/hikey/platsupport/plat/serial.h b/libplatsupport/plat_include/hikey/platsupport/plat/serial.h index 4c7c3875f..b2224935e 100644 --- a/libplatsupport/plat_include/hikey/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/hikey/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx31/platsupport/plat/clock.h b/libplatsupport/plat_include/imx31/platsupport/plat/clock.h index 057de60e4..3f884e74d 100644 --- a/libplatsupport/plat_include/imx31/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/imx31/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx31/platsupport/plat/epit_constants.h b/libplatsupport/plat_include/imx31/platsupport/plat/epit_constants.h index 52fe2eec1..86833f3e9 100644 --- a/libplatsupport/plat_include/imx31/platsupport/plat/epit_constants.h +++ b/libplatsupport/plat_include/imx31/platsupport/plat/epit_constants.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx31/platsupport/plat/gpt_constants.h b/libplatsupport/plat_include/imx31/platsupport/plat/gpt_constants.h index 52c0f09e6..fd1bf5a62 100644 --- a/libplatsupport/plat_include/imx31/platsupport/plat/gpt_constants.h +++ b/libplatsupport/plat_include/imx31/platsupport/plat/gpt_constants.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx31/platsupport/plat/i2c.h b/libplatsupport/plat_include/imx31/platsupport/plat/i2c.h index 14b63ec05..40efe17b5 100644 --- a/libplatsupport/plat_include/imx31/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/imx31/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx31/platsupport/plat/serial.h b/libplatsupport/plat_include/imx31/platsupport/plat/serial.h index 3826a4fb2..c584b06fd 100644 --- a/libplatsupport/plat_include/imx31/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/imx31/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx31/platsupport/plat/timer.h b/libplatsupport/plat_include/imx31/platsupport/plat/timer.h index 676f7064d..9ddba3bfa 100644 --- a/libplatsupport/plat_include/imx31/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/imx31/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/clock.h b/libplatsupport/plat_include/imx6/platsupport/plat/clock.h index d578c7d80..bfb538216 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/epit_constants.h b/libplatsupport/plat_include/imx6/platsupport/plat/epit_constants.h index 174b57adc..69fe1239d 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/epit_constants.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/epit_constants.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/gpio.h b/libplatsupport/plat_include/imx6/platsupport/plat/gpio.h index 72738becd..f514277b4 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/gpio.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/gpio.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/gpt_constants.h b/libplatsupport/plat_include/imx6/platsupport/plat/gpt_constants.h index aa12b0746..6d2836732 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/gpt_constants.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/gpt_constants.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/i2c.h b/libplatsupport/plat_include/imx6/platsupport/plat/i2c.h index 84afe1cb5..b9a179466 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/mux.h b/libplatsupport/plat_include/imx6/platsupport/plat/mux.h index 13d526b98..eadb0ea62 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/mux.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/mux.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/serial.h b/libplatsupport/plat_include/imx6/platsupport/plat/serial.h index c6ef85e43..10cf40634 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/src.h b/libplatsupport/plat_include/imx6/platsupport/plat/src.h index d7e7f0fc1..7c939a9ff 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/src.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/src.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx6/platsupport/plat/timer.h b/libplatsupport/plat_include/imx6/platsupport/plat/timer.h index 8a7ec4b57..8e6653cdc 100644 --- a/libplatsupport/plat_include/imx6/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/imx6/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx7/platsupport/plat/clock.h b/libplatsupport/plat_include/imx7/platsupport/plat/clock.h index 1d42815cc..6a41df437 100644 --- a/libplatsupport/plat_include/imx7/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/imx7/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx7/platsupport/plat/epit_constants.h b/libplatsupport/plat_include/imx7/platsupport/plat/epit_constants.h index 3d4c34900..50481cdcd 100644 --- a/libplatsupport/plat_include/imx7/platsupport/plat/epit_constants.h +++ b/libplatsupport/plat_include/imx7/platsupport/plat/epit_constants.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx7/platsupport/plat/gpt_constants.h b/libplatsupport/plat_include/imx7/platsupport/plat/gpt_constants.h index 61d0ee676..5b4c569a8 100644 --- a/libplatsupport/plat_include/imx7/platsupport/plat/gpt_constants.h +++ b/libplatsupport/plat_include/imx7/platsupport/plat/gpt_constants.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx7/platsupport/plat/i2c.h b/libplatsupport/plat_include/imx7/platsupport/plat/i2c.h index 84afe1cb5..b9a179466 100644 --- a/libplatsupport/plat_include/imx7/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/imx7/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx7/platsupport/plat/serial.h b/libplatsupport/plat_include/imx7/platsupport/plat/serial.h index 29f952a6c..bea59e461 100644 --- a/libplatsupport/plat_include/imx7/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/imx7/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx7/platsupport/plat/timer.h b/libplatsupport/plat_include/imx7/platsupport/plat/timer.h index df3aea0b2..9ecffaae2 100644 --- a/libplatsupport/plat_include/imx7/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/imx7/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx8m/platsupport/plat/clock.h b/libplatsupport/plat_include/imx8m/platsupport/plat/clock.h index f859607a2..faf3f062d 100644 --- a/libplatsupport/plat_include/imx8m/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/imx8m/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx8m/platsupport/plat/gpt_constants.h b/libplatsupport/plat_include/imx8m/platsupport/plat/gpt_constants.h index 36f275935..78b696ef2 100644 --- a/libplatsupport/plat_include/imx8m/platsupport/plat/gpt_constants.h +++ b/libplatsupport/plat_include/imx8m/platsupport/plat/gpt_constants.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx8m/platsupport/plat/i2c.h b/libplatsupport/plat_include/imx8m/platsupport/plat/i2c.h index bd4aabe30..672cb9ef5 100644 --- a/libplatsupport/plat_include/imx8m/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/imx8m/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx8m/platsupport/plat/serial.h b/libplatsupport/plat_include/imx8m/platsupport/plat/serial.h index eef2b91e8..133719236 100644 --- a/libplatsupport/plat_include/imx8m/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/imx8m/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/imx8m/platsupport/plat/timer.h b/libplatsupport/plat_include/imx8m/platsupport/plat/timer.h index 56dbe4de5..a4e5c56c0 100644 --- a/libplatsupport/plat_include/imx8m/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/imx8m/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/odroidc2/platsupport/plat/clock.h b/libplatsupport/plat_include/odroidc2/platsupport/plat/clock.h index 9162729f6..d72bddf77 100644 --- a/libplatsupport/plat_include/odroidc2/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/odroidc2/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/odroidc2/platsupport/plat/i2c.h b/libplatsupport/plat_include/odroidc2/platsupport/plat/i2c.h index a9d5020cf..bb3269ba0 100644 --- a/libplatsupport/plat_include/odroidc2/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/odroidc2/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/odroidc2/platsupport/plat/meson_timer.h b/libplatsupport/plat_include/odroidc2/platsupport/plat/meson_timer.h index 55b71cfd2..f7839b109 100644 --- a/libplatsupport/plat_include/odroidc2/platsupport/plat/meson_timer.h +++ b/libplatsupport/plat_include/odroidc2/platsupport/plat/meson_timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/odroidc2/platsupport/plat/serial.h b/libplatsupport/plat_include/odroidc2/platsupport/plat/serial.h index 873e1519d..a304095fb 100644 --- a/libplatsupport/plat_include/odroidc2/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/odroidc2/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/omap3/platsupport/plat/clock.h b/libplatsupport/plat_include/omap3/platsupport/plat/clock.h index af70c539d..530ad0c77 100644 --- a/libplatsupport/plat_include/omap3/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/omap3/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/omap3/platsupport/plat/gpt_constants.h b/libplatsupport/plat_include/omap3/platsupport/plat/gpt_constants.h index 620ad8f93..5e3b001ce 100644 --- a/libplatsupport/plat_include/omap3/platsupport/plat/gpt_constants.h +++ b/libplatsupport/plat_include/omap3/platsupport/plat/gpt_constants.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/omap3/platsupport/plat/i2c.h b/libplatsupport/plat_include/omap3/platsupport/plat/i2c.h index 14b63ec05..40efe17b5 100644 --- a/libplatsupport/plat_include/omap3/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/omap3/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/omap3/platsupport/plat/serial.h b/libplatsupport/plat_include/omap3/platsupport/plat/serial.h index 019e39ff5..43f11ff44 100644 --- a/libplatsupport/plat_include/omap3/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/omap3/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/README b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/README index 84ad1288e..81f2a62f4 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/README +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/README @@ -1,13 +1,7 @@ This is a generic, OS independent acpi library. diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/acpi.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/acpi.h index 041067c6f..6c8c626df 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/acpi.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/acpi.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/regions.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/regions.h index e4b691192..87ef01a16 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/regions.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/regions.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/asf.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/asf.h index 29500f8d3..8a8f308a3 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/asf.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/asf.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/bert.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/bert.h index e25caaac0..561ab2164 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/bert.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/bert.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/boot.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/boot.h index f9f03dc51..5f6fe6fda 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/boot.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/boot.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/dmar.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/dmar.h index fac78ba1d..a5c0ea1c8 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/dmar.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/dmar.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/dsdt.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/dsdt.h index 074d420d6..579f16ecf 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/dsdt.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/dsdt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/einj.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/einj.h index 56816d8c9..21a69897e 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/einj.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/einj.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/erst.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/erst.h index c3ea12141..2df9bbd8c 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/erst.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/erst.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/facs.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/facs.h index 0888b751b..20ca90f51 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/facs.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/facs.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/fadt.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/fadt.h index a3bf206c7..de38ce65c 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/fadt.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/fadt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/hest.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/hest.h index b59dd5008..d2a996dc5 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/hest.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/hest.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/hpet.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/hpet.h index 01373fd60..6766e1c4b 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/hpet.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/hpet.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/madt.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/madt.h index 099b908c0..eeb07f19d 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/madt.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/madt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/mcfg.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/mcfg.h index abb2bebbe..17d9ccc8b 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/mcfg.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/mcfg.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/rsdt.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/rsdt.h index 918179133..73f690bba 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/rsdt.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/rsdt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/spcr.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/spcr.h index c94307666..f31ae0293 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/spcr.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/spcr.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/spmi.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/spmi.h index f503ba93d..e0f9beceb 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/spmi.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/spmi.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/ssdt.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/ssdt.h index d4b551a0b..62dcc556c 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/ssdt.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/ssdt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/xsdt.h b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/xsdt.h index 873d8ebd9..ce3c6685b 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/xsdt.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/acpi/tables/xsdt.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma pack(push,1) diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/clock.h b/libplatsupport/plat_include/pc99/platsupport/plat/clock.h index 2a4bdce6f..fb1828589 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/hpet.h b/libplatsupport/plat_include/pc99/platsupport/plat/hpet.h index d3ee6397f..f36c71d12 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/hpet.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/hpet.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/pit.h b/libplatsupport/plat_include/pc99/platsupport/plat/pit.h index d654ee65b..aad8e15a8 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/pit.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/pit.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/rtc.h b/libplatsupport/plat_include/pc99/platsupport/plat/rtc.h index 330a96a2f..3104758e1 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/rtc.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/rtc.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/serial.h b/libplatsupport/plat_include/pc99/platsupport/plat/serial.h index 863aca020..13b0f1464 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/pc99/platsupport/plat/timer.h b/libplatsupport/plat_include/pc99/platsupport/plat/timer.h index feefb2eb1..a873a26f4 100644 --- a/libplatsupport/plat_include/pc99/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/pc99/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/polarfire/platsupport/plat/icicle_mss.h b/libplatsupport/plat_include/polarfire/platsupport/plat/icicle_mss.h index 7ef92f148..87f1f92c1 100644 --- a/libplatsupport/plat_include/polarfire/platsupport/plat/icicle_mss.h +++ b/libplatsupport/plat_include/polarfire/platsupport/plat/icicle_mss.h @@ -1,11 +1,7 @@ /* * Copyright 2020, DornerWorks * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DORNERWORKS_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* These values are grabbed from the ICICLE_MSS_0.xml file that is generated from diff --git a/libplatsupport/plat_include/polarfire/platsupport/plat/serial.h b/libplatsupport/plat_include/polarfire/platsupport/plat/serial.h index 24232e504..76031285a 100644 --- a/libplatsupport/plat_include/polarfire/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/polarfire/platsupport/plat/serial.h @@ -1,11 +1,7 @@ /* * Copyright 2020, DornerWorks * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DORNERWORKS_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/clock.h b/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/clock.h index 4a212a1b3..072a13ddd 100644 --- a/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/i2c.h b/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/i2c.h index 14b63ec05..40efe17b5 100644 --- a/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/serial.h b/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/serial.h index 4ee11fe3b..15d4d2941 100644 --- a/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/qemu-arm-virt/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/rocketchip/platsupport/plat/serial.h b/libplatsupport/plat_include/rocketchip/platsupport/plat/serial.h index 60d05034e..6656a5f3a 100644 --- a/libplatsupport/plat_include/rocketchip/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/rocketchip/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/rockpro64/platsupport/plat/clock.h b/libplatsupport/plat_include/rockpro64/platsupport/plat/clock.h index 7d047c24b..c8a5f1d0d 100644 --- a/libplatsupport/plat_include/rockpro64/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/rockpro64/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/rockpro64/platsupport/plat/i2c.h b/libplatsupport/plat_include/rockpro64/platsupport/plat/i2c.h index cb9e67618..5f7fa91b6 100644 --- a/libplatsupport/plat_include/rockpro64/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/rockpro64/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/rockpro64/platsupport/plat/serial.h b/libplatsupport/plat_include/rockpro64/platsupport/plat/serial.h index a2f7acf43..e5fc898ff 100644 --- a/libplatsupport/plat_include/rockpro64/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/rockpro64/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/rockpro64/platsupport/plat/timer.h b/libplatsupport/plat_include/rockpro64/platsupport/plat/timer.h index 7e96d7f01..42ef3405c 100644 --- a/libplatsupport/plat_include/rockpro64/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/rockpro64/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/spike/platsupport/plat/clock.h b/libplatsupport/plat_include/spike/platsupport/plat/clock.h index 089b31fe2..9b476e266 100644 --- a/libplatsupport/plat_include/spike/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/spike/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/spike/platsupport/plat/serial.h b/libplatsupport/plat_include/spike/platsupport/plat/serial.h index ac6a13420..45d2c7112 100644 --- a/libplatsupport/plat_include/spike/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/spike/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/spike/platsupport/plat/timer.h b/libplatsupport/plat_include/spike/platsupport/plat/timer.h index bbb9bc3b2..ccc8fe9a4 100644 --- a/libplatsupport/plat_include/spike/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/spike/platsupport/plat/timer.h @@ -1,12 +1,6 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tk1/platsupport/plat/clock.h b/libplatsupport/plat_include/tk1/platsupport/plat/clock.h index 6fee8742a..b1abe7d76 100644 --- a/libplatsupport/plat_include/tk1/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/tk1/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tk1/platsupport/plat/clock_indexes.h b/libplatsupport/plat_include/tk1/platsupport/plat/clock_indexes.h index 6bfb97458..1ff217647 100644 --- a/libplatsupport/plat_include/tk1/platsupport/plat/clock_indexes.h +++ b/libplatsupport/plat_include/tk1/platsupport/plat/clock_indexes.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tk1/platsupport/plat/gpio.h b/libplatsupport/plat_include/tk1/platsupport/plat/gpio.h index c3c21e03e..716298bc9 100644 --- a/libplatsupport/plat_include/tk1/platsupport/plat/gpio.h +++ b/libplatsupport/plat_include/tk1/platsupport/plat/gpio.h @@ -1,14 +1,8 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) -*/ + * SPDX-License-Identifier: BSD-2-Clause + */ #pragma once diff --git a/libplatsupport/plat_include/tk1/platsupport/plat/i2c.h b/libplatsupport/plat_include/tk1/platsupport/plat/i2c.h index feb660369..674485590 100644 --- a/libplatsupport/plat_include/tk1/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/tk1/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tk1/platsupport/plat/mux.h b/libplatsupport/plat_include/tk1/platsupport/plat/mux.h index 52cbe75f0..fc8bda11f 100644 --- a/libplatsupport/plat_include/tk1/platsupport/plat/mux.h +++ b/libplatsupport/plat_include/tk1/platsupport/plat/mux.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tk1/platsupport/plat/serial.h b/libplatsupport/plat_include/tk1/platsupport/plat/serial.h index 643e9925a..5369d648c 100644 --- a/libplatsupport/plat_include/tk1/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/tk1/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tk1/platsupport/plat/spi.h b/libplatsupport/plat_include/tk1/platsupport/plat/spi.h index 64a256c2f..93278425c 100644 --- a/libplatsupport/plat_include/tk1/platsupport/plat/spi.h +++ b/libplatsupport/plat_include/tk1/platsupport/plat/spi.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tk1/platsupport/plat/timer.h b/libplatsupport/plat_include/tk1/platsupport/plat/timer.h index 8bba9c11e..731ea73e8 100644 --- a/libplatsupport/plat_include/tk1/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/tk1/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/plat_include/tx1/platsupport/plat/clock.h b/libplatsupport/plat_include/tx1/platsupport/plat/clock.h index 4a212a1b3..072a13ddd 100644 --- a/libplatsupport/plat_include/tx1/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/tx1/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tx1/platsupport/plat/i2c.h b/libplatsupport/plat_include/tx1/platsupport/plat/i2c.h index 14b63ec05..40efe17b5 100644 --- a/libplatsupport/plat_include/tx1/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/tx1/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tx1/platsupport/plat/serial.h b/libplatsupport/plat_include/tx1/platsupport/plat/serial.h index abe022380..e2a60acb8 100644 --- a/libplatsupport/plat_include/tx1/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/tx1/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tx1/platsupport/plat/timer.h b/libplatsupport/plat_include/tx1/platsupport/plat/timer.h index 8bba9c11e..731ea73e8 100644 --- a/libplatsupport/plat_include/tx1/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/tx1/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/plat_include/tx2/platsupport/plat/clock.h b/libplatsupport/plat_include/tx2/platsupport/plat/clock.h index a639c61ae..42ae2aa67 100644 --- a/libplatsupport/plat_include/tx2/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/tx2/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tx2/platsupport/plat/i2c.h b/libplatsupport/plat_include/tx2/platsupport/plat/i2c.h index 741c1a90f..85cec1e8d 100644 --- a/libplatsupport/plat_include/tx2/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/tx2/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tx2/platsupport/plat/reset.h b/libplatsupport/plat_include/tx2/platsupport/plat/reset.h index 026ed6a8a..adeccaaee 100644 --- a/libplatsupport/plat_include/tx2/platsupport/plat/reset.h +++ b/libplatsupport/plat_include/tx2/platsupport/plat/reset.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tx2/platsupport/plat/serial.h b/libplatsupport/plat_include/tx2/platsupport/plat/serial.h index 68dc498e9..13f9218c3 100644 --- a/libplatsupport/plat_include/tx2/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/tx2/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/tx2/platsupport/plat/timer.h b/libplatsupport/plat_include/tx2/platsupport/plat/timer.h index c143084bd..41be1a2ba 100644 --- a/libplatsupport/plat_include/tx2/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/tx2/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/zynq7000/platsupport/plat/clock.h b/libplatsupport/plat_include/zynq7000/platsupport/plat/clock.h index feddf0bc1..c01675bb9 100644 --- a/libplatsupport/plat_include/zynq7000/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/zynq7000/platsupport/plat/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/zynq7000/platsupport/plat/i2c.h b/libplatsupport/plat_include/zynq7000/platsupport/plat/i2c.h index acb79760e..9f5dc6b9a 100644 --- a/libplatsupport/plat_include/zynq7000/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/zynq7000/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/zynq7000/platsupport/plat/serial.h b/libplatsupport/plat_include/zynq7000/platsupport/plat/serial.h index 3276843cc..74955d36b 100644 --- a/libplatsupport/plat_include/zynq7000/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/zynq7000/platsupport/plat/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/zynq7000/platsupport/plat/src.h b/libplatsupport/plat_include/zynq7000/platsupport/plat/src.h index 2b2589b6d..2f2131321 100644 --- a/libplatsupport/plat_include/zynq7000/platsupport/plat/src.h +++ b/libplatsupport/plat_include/zynq7000/platsupport/plat/src.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/zynq7000/platsupport/plat/timer.h b/libplatsupport/plat_include/zynq7000/platsupport/plat/timer.h index db51ead72..cf69e8e5c 100644 --- a/libplatsupport/plat_include/zynq7000/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/zynq7000/platsupport/plat/timer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once #include diff --git a/libplatsupport/plat_include/zynq7000/platsupport/plat/tmu.h b/libplatsupport/plat_include/zynq7000/platsupport/plat/tmu.h index de71881da..430f6aa69 100644 --- a/libplatsupport/plat_include/zynq7000/platsupport/plat/tmu.h +++ b/libplatsupport/plat_include/zynq7000/platsupport/plat/tmu.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/zynqmp/platsupport/plat/clock.h b/libplatsupport/plat_include/zynqmp/platsupport/plat/clock.h index 4ba33dbd8..41ae3231e 100644 --- a/libplatsupport/plat_include/zynqmp/platsupport/plat/clock.h +++ b/libplatsupport/plat_include/zynqmp/platsupport/plat/clock.h @@ -1,12 +1,9 @@ /* * Copyright 2017, DornerWorks * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DORNERWORKS_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ + /* * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under * a DARPA SBIR, Contract Number D16PC00107. diff --git a/libplatsupport/plat_include/zynqmp/platsupport/plat/i2c.h b/libplatsupport/plat_include/zynqmp/platsupport/plat/i2c.h index acb79760e..9f5dc6b9a 100644 --- a/libplatsupport/plat_include/zynqmp/platsupport/plat/i2c.h +++ b/libplatsupport/plat_include/zynqmp/platsupport/plat/i2c.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/plat_include/zynqmp/platsupport/plat/serial.h b/libplatsupport/plat_include/zynqmp/platsupport/plat/serial.h index c00357e53..f1b8eef1c 100644 --- a/libplatsupport/plat_include/zynqmp/platsupport/plat/serial.h +++ b/libplatsupport/plat_include/zynqmp/platsupport/plat/serial.h @@ -1,15 +1,10 @@ /* * Copyright 2017, DornerWorks - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_DORNERWORKS_BSD) + * SPDX-License-Identifier: GPL-2.0-only */ + /* * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under * a DARPA SBIR, Contract Number D16PC00107. diff --git a/libplatsupport/plat_include/zynqmp/platsupport/plat/src.h b/libplatsupport/plat_include/zynqmp/platsupport/plat/src.h index 18b763dab..bc5024711 100644 --- a/libplatsupport/plat_include/zynqmp/platsupport/plat/src.h +++ b/libplatsupport/plat_include/zynqmp/platsupport/plat/src.h @@ -1,14 +1,8 @@ /* * Copyright 2017, DornerWorks - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_DORNERWORKS_BSD) + * SPDX-License-Identifier: GPL-2.0-only */ /* * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under diff --git a/libplatsupport/plat_include/zynqmp/platsupport/plat/timer.h b/libplatsupport/plat_include/zynqmp/platsupport/plat/timer.h index dcd266c00..44a0b81e6 100644 --- a/libplatsupport/plat_include/zynqmp/platsupport/plat/timer.h +++ b/libplatsupport/plat_include/zynqmp/platsupport/plat/timer.h @@ -1,14 +1,8 @@ /* * Copyright 2017, DornerWorks - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_DORNERWORKS_BSD) + * SPDX-License-Identifier: GPL-2.0-only */ /* * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under diff --git a/libplatsupport/sel4_arch_include/aarch32/platsupport/sel4_arch/util.h b/libplatsupport/sel4_arch_include/aarch32/platsupport/sel4_arch/util.h index f4baeba5d..a32f56331 100644 --- a/libplatsupport/sel4_arch_include/aarch32/platsupport/sel4_arch/util.h +++ b/libplatsupport/sel4_arch_include/aarch32/platsupport/sel4_arch/util.h @@ -1,14 +1,8 @@ /* -* Copyright 2019, Data61 -* Commonwealth Scientific and Industrial Research Organisation (CSIRO) -* ABN 41 687 119 230. -* -* This software may be distributed and modified according to the terms of -* the BSD 2-Clause license. Note that NO WARRANTY is provided. -* See "LICENSE_BSD2.txt" for details. -* -* @TAG(DATA61_BSD) -*/ + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) + * + * SPDX-License-Identifier: BSD-2-Clause + */ #pragma once diff --git a/libplatsupport/sel4_arch_include/aarch64/platsupport/sel4_arch/util.h b/libplatsupport/sel4_arch_include/aarch64/platsupport/sel4_arch/util.h index 9ec950ad9..c6830199d 100644 --- a/libplatsupport/sel4_arch_include/aarch64/platsupport/sel4_arch/util.h +++ b/libplatsupport/sel4_arch_include/aarch64/platsupport/sel4_arch/util.h @@ -1,14 +1,8 @@ /* -* Copyright 2019, Data61 -* Commonwealth Scientific and Industrial Research Organisation (CSIRO) -* ABN 41 687 119 230. -* -* This software may be distributed and modified according to the terms of -* the BSD 2-Clause license. Note that NO WARRANTY is provided. -* See "LICENSE_BSD2.txt" for details. -* -* @TAG(DATA61_BSD) -*/ + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) + * + * SPDX-License-Identifier: BSD-2-Clause + */ #pragma once diff --git a/libplatsupport/src/arch/arm/clock.c b/libplatsupport/src/arch/arm/clock.c index b652bf00b..293ba342e 100644 --- a/libplatsupport/src/arch/arm/clock.c +++ b/libplatsupport/src/arch/arm/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "clock.h" diff --git a/libplatsupport/src/arch/arm/clock.h b/libplatsupport/src/arch/arm/clock.h index 710312f3a..75d65fb37 100644 --- a/libplatsupport/src/arch/arm/clock.h +++ b/libplatsupport/src/arch/arm/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/arch/arm/delay.c b/libplatsupport/src/arch/arm/delay.c index 397f082af..f4e18f4b1 100644 --- a/libplatsupport/src/arch/arm/delay.c +++ b/libplatsupport/src/arch/arm/delay.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/arm/dma330.c b/libplatsupport/src/arch/arm/dma330.c index 61002fe76..3566877ba 100644 --- a/libplatsupport/src/arch/arm/dma330.c +++ b/libplatsupport/src/arch/arm/dma330.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/arm/generic_ltimer.c b/libplatsupport/src/arch/arm/generic_ltimer.c index ed1b41b7b..14d449cc6 100644 --- a/libplatsupport/src/arch/arm/generic_ltimer.c +++ b/libplatsupport/src/arch/arm/generic_ltimer.c @@ -1,14 +1,9 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 128 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ + #include #include #include diff --git a/libplatsupport/src/arch/arm/generic_timer.c b/libplatsupport/src/arch/arm/generic_timer.c index be1c8b0de..4d209888a 100644 --- a/libplatsupport/src/arch/arm/generic_timer.c +++ b/libplatsupport/src/arch/arm/generic_timer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/arch/arm/gpio_utils.c b/libplatsupport/src/arch/arm/gpio_utils.c index e496a6144..188a77b03 100644 --- a/libplatsupport/src/arch/arm/gpio_utils.c +++ b/libplatsupport/src/arch/arm/gpio_utils.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/arm/i2c.c b/libplatsupport/src/arch/arm/i2c.c index b5a0b979b..1e4a919a0 100644 --- a/libplatsupport/src/arch/arm/i2c.c +++ b/libplatsupport/src/arch/arm/i2c.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/arm/i2c_bitbang.c b/libplatsupport/src/arch/arm/i2c_bitbang.c index 7ee9f3e71..9d2e7d1fa 100644 --- a/libplatsupport/src/arch/arm/i2c_bitbang.c +++ b/libplatsupport/src/arch/arm/i2c_bitbang.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/arm/irqchip/avic.c b/libplatsupport/src/arch/arm/irqchip/avic.c index 4926f9197..fe079ab59 100644 --- a/libplatsupport/src/arch/arm/irqchip/avic.c +++ b/libplatsupport/src/arch/arm/irqchip/avic.c @@ -1,14 +1,8 @@ /* -* Copyright 2019, Data61 -* Commonwealth Scientific and Industrial Research Organisation (CSIRO) -* ABN 41 687 119 230. -* -* This software may be distributed and modified according to the terms of -* the BSD 2-Clause license. Note that NO WARRANTY is provided. -* See "LICENSE_BSD2.txt" for details. -* -* @TAG(DATA61_BSD) -*/ + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) + * + * SPDX-License-Identifier: BSD-2-Clause + */ #include #include diff --git a/libplatsupport/src/arch/arm/irqchip/gic.c b/libplatsupport/src/arch/arm/irqchip/gic.c index 315cb580e..8c01b49bd 100644 --- a/libplatsupport/src/arch/arm/irqchip/gic.c +++ b/libplatsupport/src/arch/arm/irqchip/gic.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/arm/irqchip/gicv3.c b/libplatsupport/src/arch/arm/irqchip/gicv3.c index e36d440e5..c155184d0 100644 --- a/libplatsupport/src/arch/arm/irqchip/gicv3.c +++ b/libplatsupport/src/arch/arm/irqchip/gicv3.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/arm/irqchip/omap3.c b/libplatsupport/src/arch/arm/irqchip/omap3.c index a39b9dd62..41c369b14 100644 --- a/libplatsupport/src/arch/arm/irqchip/omap3.c +++ b/libplatsupport/src/arch/arm/irqchip/omap3.c @@ -1,14 +1,8 @@ /* -* Copyright 2020, Data61 -* Commonwealth Scientific and Industrial Research Organisation (CSIRO) -* ABN 41 687 119 230. -* -* This software may be distributed and modified according to the terms of -* the BSD 2-Clause license. Note that NO WARRANTY is provided. -* See "LICENSE_BSD2.txt" for details. -* -* @TAG(DATA61_BSD) -*/ + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) + * + * SPDX-License-Identifier: BSD-2-Clause + */ #include #include diff --git a/libplatsupport/src/arch/arm/irqchip/tegra.c b/libplatsupport/src/arch/arm/irqchip/tegra.c index b68eb6346..35e8a3e20 100644 --- a/libplatsupport/src/arch/arm/irqchip/tegra.c +++ b/libplatsupport/src/arch/arm/irqchip/tegra.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/riscv/irqchip/plic.c b/libplatsupport/src/arch/riscv/irqchip/plic.c index bb2cd176a..53dce425f 100644 --- a/libplatsupport/src/arch/riscv/irqchip/plic.c +++ b/libplatsupport/src/arch/riscv/irqchip/plic.c @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/x86/delay.c b/libplatsupport/src/arch/x86/delay.c index 184b0cf6e..9af8507cc 100644 --- a/libplatsupport/src/arch/x86/delay.c +++ b/libplatsupport/src/arch/x86/delay.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/arch/x86/tsc.c b/libplatsupport/src/arch/x86/tsc.c index 593da70d4..9b9e9c3d4 100644 --- a/libplatsupport/src/arch/x86/tsc.c +++ b/libplatsupport/src/arch/x86/tsc.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/chardev.h b/libplatsupport/src/chardev.h index 48b479f60..88ba2ab34 100644 --- a/libplatsupport/src/chardev.h +++ b/libplatsupport/src/chardev.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/common.h b/libplatsupport/src/common.h index c09570f35..3983acd05 100644 --- a/libplatsupport/src/common.h +++ b/libplatsupport/src/common.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/fdt.c b/libplatsupport/src/fdt.c index dbe424343..f5078d40a 100644 --- a/libplatsupport/src/fdt.c +++ b/libplatsupport/src/fdt.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/io.c b/libplatsupport/src/io.c index a4b13cc24..92e24371c 100644 --- a/libplatsupport/src/io.c +++ b/libplatsupport/src/io.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/irqchip.h b/libplatsupport/src/irqchip.h index f146817c8..f0cc9500e 100644 --- a/libplatsupport/src/irqchip.h +++ b/libplatsupport/src/irqchip.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/local_time_manager.c b/libplatsupport/src/local_time_manager.c index 17baed0e4..251e301ec 100644 --- a/libplatsupport/src/local_time_manager.c +++ b/libplatsupport/src/local_time_manager.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/ltimer.h b/libplatsupport/src/ltimer.h index ee1f4252f..6cb458d98 100644 --- a/libplatsupport/src/ltimer.h +++ b/libplatsupport/src/ltimer.h @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/exynos/clock.c b/libplatsupport/src/mach/exynos/clock.c index 964f1840c..ad718cd98 100644 --- a/libplatsupport/src/mach/exynos/clock.c +++ b/libplatsupport/src/mach/exynos/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "clock.h" diff --git a/libplatsupport/src/mach/exynos/clock.h b/libplatsupport/src/mach/exynos/clock.h index f44faca73..ca1a96121 100644 --- a/libplatsupport/src/mach/exynos/clock.h +++ b/libplatsupport/src/mach/exynos/clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/mach/exynos/clock/exynos_5422_clock.c b/libplatsupport/src/mach/exynos/clock/exynos_5422_clock.c index 7cf95e114..1934ef2bd 100644 --- a/libplatsupport/src/mach/exynos/clock/exynos_5422_clock.c +++ b/libplatsupport/src/mach/exynos/clock/exynos_5422_clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../clock.h" diff --git a/libplatsupport/src/mach/exynos/clock/exynos_5422_clock.h b/libplatsupport/src/mach/exynos/clock/exynos_5422_clock.h index fea4934f1..760ef001a 100644 --- a/libplatsupport/src/mach/exynos/clock/exynos_5422_clock.h +++ b/libplatsupport/src/mach/exynos/clock/exynos_5422_clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/mach/exynos/clock/exynos_common_clock.c b/libplatsupport/src/mach/exynos/clock/exynos_common_clock.c index 9da385a7f..49fde8334 100644 --- a/libplatsupport/src/mach/exynos/clock/exynos_common_clock.c +++ b/libplatsupport/src/mach/exynos/clock/exynos_common_clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../clock.h" diff --git a/libplatsupport/src/mach/exynos/clock/exynos_common_clock.h b/libplatsupport/src/mach/exynos/clock/exynos_common_clock.h index 900460123..6a116bd8f 100644 --- a/libplatsupport/src/mach/exynos/clock/exynos_common_clock.h +++ b/libplatsupport/src/mach/exynos/clock/exynos_common_clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/mach/exynos/i2c.c b/libplatsupport/src/mach/exynos/i2c.c index 63bdb7e1b..825221beb 100644 --- a/libplatsupport/src/mach/exynos/i2c.c +++ b/libplatsupport/src/mach/exynos/i2c.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/exynos/irq_combiner.c b/libplatsupport/src/mach/exynos/irq_combiner.c index b13fbe86b..6c1294cb7 100644 --- a/libplatsupport/src/mach/exynos/irq_combiner.c +++ b/libplatsupport/src/mach/exynos/irq_combiner.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/exynos/ltimer.c b/libplatsupport/src/mach/exynos/ltimer.c index 2428747bc..4c711c7b2 100644 --- a/libplatsupport/src/mach/exynos/ltimer.c +++ b/libplatsupport/src/mach/exynos/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Implementation of a logical timer for omap platforms * diff --git a/libplatsupport/src/mach/exynos/mux.c b/libplatsupport/src/mach/exynos/mux.c index 0bbaf35c4..1c39dbcf9 100644 --- a/libplatsupport/src/mach/exynos/mux.c +++ b/libplatsupport/src/mach/exynos/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/exynos/mux.h b/libplatsupport/src/mach/exynos/mux.h index 23dc3efbe..df9ed0016 100644 --- a/libplatsupport/src/mach/exynos/mux.h +++ b/libplatsupport/src/mach/exynos/mux.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/mach/exynos/pmic.c b/libplatsupport/src/mach/exynos/pmic.c index 0e085a3fd..3b2406479 100644 --- a/libplatsupport/src/mach/exynos/pmic.c +++ b/libplatsupport/src/mach/exynos/pmic.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/exynos/pmic_rtc.c b/libplatsupport/src/mach/exynos/pmic_rtc.c index 4a178f77a..6942a112c 100644 --- a/libplatsupport/src/mach/exynos/pmic_rtc.c +++ b/libplatsupport/src/mach/exynos/pmic_rtc.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/exynos/pwm.c b/libplatsupport/src/mach/exynos/pwm.c index b64161b5c..87a39b3a0 100644 --- a/libplatsupport/src/mach/exynos/pwm.c +++ b/libplatsupport/src/mach/exynos/pwm.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/exynos/serial.c b/libplatsupport/src/mach/exynos/serial.c index c67d1221e..0b9e7b7a9 100644 --- a/libplatsupport/src/mach/exynos/serial.c +++ b/libplatsupport/src/mach/exynos/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* disabled until someone makes it compile */ diff --git a/libplatsupport/src/mach/exynos/serial.h b/libplatsupport/src/mach/exynos/serial.h index 4cc65f6b8..2022e131f 100644 --- a/libplatsupport/src/mach/exynos/serial.h +++ b/libplatsupport/src/mach/exynos/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../chardev.h" diff --git a/libplatsupport/src/mach/exynos/spi.c b/libplatsupport/src/mach/exynos/spi.c index 3033d1e49..7dda12bf1 100644 --- a/libplatsupport/src/mach/exynos/spi.c +++ b/libplatsupport/src/mach/exynos/spi.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* SPI driver */ diff --git a/libplatsupport/src/mach/exynos/tmu.c b/libplatsupport/src/mach/exynos/tmu.c index 7350c9aeb..96bce23e4 100644 --- a/libplatsupport/src/mach/exynos/tmu.c +++ b/libplatsupport/src/mach/exynos/tmu.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/imx/epit/epit.c b/libplatsupport/src/mach/imx/epit/epit.c index 875016a16..f38fea94e 100644 --- a/libplatsupport/src/mach/imx/epit/epit.c +++ b/libplatsupport/src/mach/imx/epit/epit.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/imx/gpt.c b/libplatsupport/src/mach/imx/gpt.c index 3e74ba56d..dceca7d84 100644 --- a/libplatsupport/src/mach/imx/gpt.c +++ b/libplatsupport/src/mach/imx/gpt.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/imx/ltimer.c b/libplatsupport/src/mach/imx/ltimer.c index 53a432e37..5d672a794 100644 --- a/libplatsupport/src/mach/imx/ltimer.c +++ b/libplatsupport/src/mach/imx/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Implementation of a logical timer for imx platforms diff --git a/libplatsupport/src/mach/imx/serial/serial.c b/libplatsupport/src/mach/imx/serial/serial.c index f8f3778c8..280196587 100644 --- a/libplatsupport/src/mach/imx/serial/serial.c +++ b/libplatsupport/src/mach/imx/serial/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/nvidia/chardev.c b/libplatsupport/src/mach/nvidia/chardev.c index 4a007d201..d751e3790 100644 --- a/libplatsupport/src/mach/nvidia/chardev.c +++ b/libplatsupport/src/mach/nvidia/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/mach/nvidia/ltimer.c b/libplatsupport/src/mach/nvidia/ltimer.c index d98da4664..fcc9c55ee 100644 --- a/libplatsupport/src/mach/nvidia/ltimer.c +++ b/libplatsupport/src/mach/nvidia/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* diff --git a/libplatsupport/src/mach/nvidia/serial.c b/libplatsupport/src/mach/nvidia/serial.c index 9ea139e7d..825a276bf 100644 --- a/libplatsupport/src/mach/nvidia/serial.c +++ b/libplatsupport/src/mach/nvidia/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/mach/nvidia/timer.c b/libplatsupport/src/mach/nvidia/timer.c index 8aa7d0c5f..7ab432d37 100644 --- a/libplatsupport/src/mach/nvidia/timer.c +++ b/libplatsupport/src/mach/nvidia/timer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/omap/gpt.c b/libplatsupport/src/mach/omap/gpt.c index ba0f31503..e6a10d75e 100644 --- a/libplatsupport/src/mach/omap/gpt.c +++ b/libplatsupport/src/mach/omap/gpt.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/omap/ltimer.c b/libplatsupport/src/mach/omap/ltimer.c index 8122b48f8..d88ac8d74 100644 --- a/libplatsupport/src/mach/omap/ltimer.c +++ b/libplatsupport/src/mach/omap/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Implementation of a logical timer for omap platforms * diff --git a/libplatsupport/src/mach/zynq/axi_uartlite.c b/libplatsupport/src/mach/zynq/axi_uartlite.c index 8c96a2c9d..99bf0e0dc 100644 --- a/libplatsupport/src/mach/zynq/axi_uartlite.c +++ b/libplatsupport/src/mach/zynq/axi_uartlite.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/zynq/chardev.c b/libplatsupport/src/mach/zynq/chardev.c index d358cdc42..6a2d954a3 100644 --- a/libplatsupport/src/mach/zynq/chardev.c +++ b/libplatsupport/src/mach/zynq/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/mach/zynq/ltimer.c b/libplatsupport/src/mach/zynq/ltimer.c index 1431737a6..77bfff81a 100644 --- a/libplatsupport/src/mach/zynq/ltimer.c +++ b/libplatsupport/src/mach/zynq/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Minimal implementation of a logical timer for zynq diff --git a/libplatsupport/src/mach/zynq/mux.c b/libplatsupport/src/mach/zynq/mux.c index 2cc4a1212..b880261c3 100644 --- a/libplatsupport/src/mach/zynq/mux.c +++ b/libplatsupport/src/mach/zynq/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/zynq/serial.c b/libplatsupport/src/mach/zynq/serial.c index 5d1f2f8e4..15e47b031 100644 --- a/libplatsupport/src/mach/zynq/serial.c +++ b/libplatsupport/src/mach/zynq/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/mach/zynq/timer.c b/libplatsupport/src/mach/zynq/timer.c index f0bb71b00..b6d2167fd 100644 --- a/libplatsupport/src/mach/zynq/timer.c +++ b/libplatsupport/src/mach/zynq/timer.c @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/am335x/chardev.c b/libplatsupport/src/plat/am335x/chardev.c index 777032acc..68f93cb72 100644 --- a/libplatsupport/src/plat/am335x/chardev.c +++ b/libplatsupport/src/plat/am335x/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/am335x/i2c.c b/libplatsupport/src/plat/am335x/i2c.c index 43d553578..89dc4d127 100644 --- a/libplatsupport/src/plat/am335x/i2c.c +++ b/libplatsupport/src/plat/am335x/i2c.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* warning: use of callbacks is NOT tested with this driver */ diff --git a/libplatsupport/src/plat/am335x/ltimer.c b/libplatsupport/src/plat/am335x/ltimer.c index c068e10a7..1f7660e4e 100644 --- a/libplatsupport/src/plat/am335x/ltimer.c +++ b/libplatsupport/src/plat/am335x/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Implementation of a logical timer for beagle bone diff --git a/libplatsupport/src/plat/am335x/serial.c b/libplatsupport/src/plat/am335x/serial.c index fd5d38972..2c215243c 100644 --- a/libplatsupport/src/plat/am335x/serial.c +++ b/libplatsupport/src/plat/am335x/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/am335x/timer.c b/libplatsupport/src/plat/am335x/timer.c index 143e5d354..b83f9d590 100644 --- a/libplatsupport/src/plat/am335x/timer.c +++ b/libplatsupport/src/plat/am335x/timer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/apq8064/chardev.c b/libplatsupport/src/plat/apq8064/chardev.c index 6fdaf0b6f..9698eb2cc 100644 --- a/libplatsupport/src/plat/apq8064/chardev.c +++ b/libplatsupport/src/plat/apq8064/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/apq8064/clock.c b/libplatsupport/src/plat/apq8064/clock.c index 53059f1a5..a6854c78d 100644 --- a/libplatsupport/src/plat/apq8064/clock.c +++ b/libplatsupport/src/plat/apq8064/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../arch/arm/clock.h" diff --git a/libplatsupport/src/plat/apq8064/intc.c b/libplatsupport/src/plat/apq8064/intc.c index a98f8b084..86a30b8cf 100644 --- a/libplatsupport/src/plat/apq8064/intc.c +++ b/libplatsupport/src/plat/apq8064/intc.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/apq8064/mux.c b/libplatsupport/src/plat/apq8064/mux.c index 6b7bd832e..32c3ebcff 100644 --- a/libplatsupport/src/plat/apq8064/mux.c +++ b/libplatsupport/src/plat/apq8064/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/apq8064/serial.c b/libplatsupport/src/plat/apq8064/serial.c index 533d26141..51884047b 100644 --- a/libplatsupport/src/plat/apq8064/serial.c +++ b/libplatsupport/src/plat/apq8064/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/apq8064/timer.c b/libplatsupport/src/plat/apq8064/timer.c index 01fcedd97..b684ccbe6 100644 --- a/libplatsupport/src/plat/apq8064/timer.c +++ b/libplatsupport/src/plat/apq8064/timer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* @AUTHOR(akroh@ertos.nicta.com.au) */ diff --git a/libplatsupport/src/plat/ariane/chardev.c b/libplatsupport/src/plat/ariane/chardev.c index 3b54e7a4d..0ad021ddc 100644 --- a/libplatsupport/src/plat/ariane/chardev.c +++ b/libplatsupport/src/plat/ariane/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../chardev.h" diff --git a/libplatsupport/src/plat/ariane/serial.c b/libplatsupport/src/plat/ariane/serial.c index 47b24c2f6..921b15139 100644 --- a/libplatsupport/src/plat/ariane/serial.c +++ b/libplatsupport/src/plat/ariane/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/bcm2837/chardev.c b/libplatsupport/src/plat/bcm2837/chardev.c index f89551877..e3753bd59 100644 --- a/libplatsupport/src/plat/bcm2837/chardev.c +++ b/libplatsupport/src/plat/bcm2837/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/bcm2837/clock.c b/libplatsupport/src/plat/bcm2837/clock.c index a110c8e87..a46fa2260 100644 --- a/libplatsupport/src/plat/bcm2837/clock.c +++ b/libplatsupport/src/plat/bcm2837/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/bcm2837/ltimer.c b/libplatsupport/src/plat/bcm2837/ltimer.c index 4c04a3d71..7f0b6201d 100644 --- a/libplatsupport/src/plat/bcm2837/ltimer.c +++ b/libplatsupport/src/plat/bcm2837/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Implementation of a logical timer for omap platforms * diff --git a/libplatsupport/src/plat/bcm2837/serial.c b/libplatsupport/src/plat/bcm2837/serial.c index bba810824..b7ca83549 100644 --- a/libplatsupport/src/plat/bcm2837/serial.c +++ b/libplatsupport/src/plat/bcm2837/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/bcm2837/serial.h b/libplatsupport/src/plat/bcm2837/serial.h index 89063647e..1c856b310 100644 --- a/libplatsupport/src/plat/bcm2837/serial.h +++ b/libplatsupport/src/plat/bcm2837/serial.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../chardev.h" diff --git a/libplatsupport/src/plat/bcm2837/spt.c b/libplatsupport/src/plat/bcm2837/spt.c index 85e97066a..059400fd9 100644 --- a/libplatsupport/src/plat/bcm2837/spt.c +++ b/libplatsupport/src/plat/bcm2837/spt.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/bcm2837/system_timer.c b/libplatsupport/src/plat/bcm2837/system_timer.c index 036471d9e..b4ae67325 100644 --- a/libplatsupport/src/plat/bcm2837/system_timer.c +++ b/libplatsupport/src/plat/bcm2837/system_timer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/exynos4/clock.c b/libplatsupport/src/plat/exynos4/clock.c index 8ebe86af7..5b6921372 100644 --- a/libplatsupport/src/plat/exynos4/clock.c +++ b/libplatsupport/src/plat/exynos4/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../common.h" diff --git a/libplatsupport/src/plat/exynos4/mux.c b/libplatsupport/src/plat/exynos4/mux.c index 5984a6fc3..9514bd6fc 100644 --- a/libplatsupport/src/plat/exynos4/mux.c +++ b/libplatsupport/src/plat/exynos4/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../mach/exynos/mux.h" diff --git a/libplatsupport/src/plat/exynos4/src.c b/libplatsupport/src/plat/exynos4/src.c index 69312eb48..9a633baeb 100644 --- a/libplatsupport/src/plat/exynos4/src.c +++ b/libplatsupport/src/plat/exynos4/src.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include "../../services.h" diff --git a/libplatsupport/src/plat/exynos5/clock.c b/libplatsupport/src/plat/exynos5/clock.c index b6d47cad0..1ca0833e1 100644 --- a/libplatsupport/src/plat/exynos5/clock.c +++ b/libplatsupport/src/plat/exynos5/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../arch/arm/clock.h" #include "../../mach/exynos/clock.h" diff --git a/libplatsupport/src/plat/exynos5/exynos_5422_clock.h b/libplatsupport/src/plat/exynos5/exynos_5422_clock.h index 1f090afc4..a6a336d81 100644 --- a/libplatsupport/src/plat/exynos5/exynos_5422_clock.h +++ b/libplatsupport/src/plat/exynos5/exynos_5422_clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/exynos5/exynos_common_clock.h b/libplatsupport/src/plat/exynos5/exynos_common_clock.h index 8f7068e52..6c0643b7a 100644 --- a/libplatsupport/src/plat/exynos5/exynos_common_clock.h +++ b/libplatsupport/src/plat/exynos5/exynos_common_clock.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/exynos5/mux.c b/libplatsupport/src/plat/exynos5/mux.c index 90d57090b..d503dbbf8 100644 --- a/libplatsupport/src/plat/exynos5/mux.c +++ b/libplatsupport/src/plat/exynos5/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../mach/exynos/mux.h" #include diff --git a/libplatsupport/src/plat/exynos5/sysreg.c b/libplatsupport/src/plat/exynos5/sysreg.c index 9dbadf9b6..38679c0bf 100644 --- a/libplatsupport/src/plat/exynos5/sysreg.c +++ b/libplatsupport/src/plat/exynos5/sysreg.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include "../../services.h" diff --git a/libplatsupport/src/plat/fvp/chardev.c b/libplatsupport/src/plat/fvp/chardev.c index a6ebd10e6..a0073d7f6 100644 --- a/libplatsupport/src/plat/fvp/chardev.c +++ b/libplatsupport/src/plat/fvp/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/fvp/clock_mux.c b/libplatsupport/src/plat/fvp/clock_mux.c index edd7cdf6d..23a3c0bc5 100644 --- a/libplatsupport/src/plat/fvp/clock_mux.c +++ b/libplatsupport/src/plat/fvp/clock_mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/fvp/ltimer.c b/libplatsupport/src/plat/fvp/ltimer.c index c99324d9d..6ec6cdbac 100644 --- a/libplatsupport/src/plat/fvp/ltimer.c +++ b/libplatsupport/src/plat/fvp/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/fvp/serial.c b/libplatsupport/src/plat/fvp/serial.c index 910a9c2ce..5b8db1ad3 100644 --- a/libplatsupport/src/plat/fvp/serial.c +++ b/libplatsupport/src/plat/fvp/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Mostly copy/paste from the HiKey plat. diff --git a/libplatsupport/src/plat/fvp/sp804.c b/libplatsupport/src/plat/fvp/sp804.c index cc87faefd..71ef26827 100644 --- a/libplatsupport/src/plat/fvp/sp804.c +++ b/libplatsupport/src/plat/fvp/sp804.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/hifive/chardev.c b/libplatsupport/src/plat/hifive/chardev.c index 9a0843406..8a2e76368 100644 --- a/libplatsupport/src/plat/hifive/chardev.c +++ b/libplatsupport/src/plat/hifive/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/hifive/ltimer.c b/libplatsupport/src/plat/hifive/ltimer.c index b0ccbb7a2..ba145d65e 100644 --- a/libplatsupport/src/plat/hifive/ltimer.c +++ b/libplatsupport/src/plat/hifive/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Implementation of a logical timer for HiFive Unleashed platform. * diff --git a/libplatsupport/src/plat/hifive/pwm.c b/libplatsupport/src/plat/hifive/pwm.c index 87bee7f39..464be6298 100644 --- a/libplatsupport/src/plat/hifive/pwm.c +++ b/libplatsupport/src/plat/hifive/pwm.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/hifive/uart.c b/libplatsupport/src/plat/hifive/uart.c index 547163fda..b6abdcb82 100644 --- a/libplatsupport/src/plat/hifive/uart.c +++ b/libplatsupport/src/plat/hifive/uart.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/hikey/chardev.c b/libplatsupport/src/plat/hikey/chardev.c index 65fbd9f88..71cc0f9de 100644 --- a/libplatsupport/src/plat/hikey/chardev.c +++ b/libplatsupport/src/plat/hikey/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/hikey/dmt.c b/libplatsupport/src/plat/hikey/dmt.c index 031ca9cb7..26f83ca6a 100644 --- a/libplatsupport/src/plat/hikey/dmt.c +++ b/libplatsupport/src/plat/hikey/dmt.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/hikey/ltimer.c b/libplatsupport/src/plat/hikey/ltimer.c index b20b2621c..355d2647e 100644 --- a/libplatsupport/src/plat/hikey/ltimer.c +++ b/libplatsupport/src/plat/hikey/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/hikey/rtc.c b/libplatsupport/src/plat/hikey/rtc.c index 7fb163221..51d06a70f 100644 --- a/libplatsupport/src/plat/hikey/rtc.c +++ b/libplatsupport/src/plat/hikey/rtc.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/hikey/serial.c b/libplatsupport/src/plat/hikey/serial.c index 7d57819d7..e9f30d70b 100644 --- a/libplatsupport/src/plat/hikey/serial.c +++ b/libplatsupport/src/plat/hikey/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx31/chardev.c b/libplatsupport/src/plat/imx31/chardev.c index a4fe12030..1556c4ef3 100644 --- a/libplatsupport/src/plat/imx31/chardev.c +++ b/libplatsupport/src/plat/imx31/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* diff --git a/libplatsupport/src/plat/imx31/clock.c b/libplatsupport/src/plat/imx31/clock.c index e50cd7490..3c391a0ec 100644 --- a/libplatsupport/src/plat/imx31/clock.c +++ b/libplatsupport/src/plat/imx31/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../arch/arm/clock.h" #include "../../services.h" diff --git a/libplatsupport/src/plat/imx31/mux.c b/libplatsupport/src/plat/imx31/mux.c index c6774c284..be4db67fd 100644 --- a/libplatsupport/src/plat/imx31/mux.c +++ b/libplatsupport/src/plat/imx31/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/imx31/serial.c b/libplatsupport/src/plat/imx31/serial.c index e8cd09285..4f48a3856 100644 --- a/libplatsupport/src/plat/imx31/serial.c +++ b/libplatsupport/src/plat/imx31/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx6/chardev.c b/libplatsupport/src/plat/imx6/chardev.c index 2c0a1ac1b..df4a0b468 100644 --- a/libplatsupport/src/plat/imx6/chardev.c +++ b/libplatsupport/src/plat/imx6/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/imx6/clock.c b/libplatsupport/src/plat/imx6/clock.c index df90152cd..cf36a5692 100644 --- a/libplatsupport/src/plat/imx6/clock.c +++ b/libplatsupport/src/plat/imx6/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx6/gpio.c b/libplatsupport/src/plat/imx6/gpio.c index bbb5b898e..3b2df820f 100644 --- a/libplatsupport/src/plat/imx6/gpio.c +++ b/libplatsupport/src/plat/imx6/gpio.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx6/i2c.c b/libplatsupport/src/plat/imx6/i2c.c index dc3cd3642..28a1913df 100644 --- a/libplatsupport/src/plat/imx6/i2c.c +++ b/libplatsupport/src/plat/imx6/i2c.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx6/mux.c b/libplatsupport/src/plat/imx6/mux.c index 2abc977f2..d41f6fd32 100644 --- a/libplatsupport/src/plat/imx6/mux.c +++ b/libplatsupport/src/plat/imx6/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx6/mux.h b/libplatsupport/src/plat/imx6/mux.h index 216e883bb..f1c511ec1 100644 --- a/libplatsupport/src/plat/imx6/mux.h +++ b/libplatsupport/src/plat/imx6/mux.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx6/src.c b/libplatsupport/src/plat/imx6/src.c index d71cece9d..540bc563d 100644 --- a/libplatsupport/src/plat/imx6/src.c +++ b/libplatsupport/src/plat/imx6/src.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx7/chardev.c b/libplatsupport/src/plat/imx7/chardev.c index 5f1a3c913..10f9e1d1b 100644 --- a/libplatsupport/src/plat/imx7/chardev.c +++ b/libplatsupport/src/plat/imx7/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/imx7/gpio.c b/libplatsupport/src/plat/imx7/gpio.c index b28c9ee67..dd28349fe 100644 --- a/libplatsupport/src/plat/imx7/gpio.c +++ b/libplatsupport/src/plat/imx7/gpio.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx7/i2c.c b/libplatsupport/src/plat/imx7/i2c.c index 8a8ae5ae0..1685e55c3 100644 --- a/libplatsupport/src/plat/imx7/i2c.c +++ b/libplatsupport/src/plat/imx7/i2c.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/imx8m/chardev.c b/libplatsupport/src/plat/imx8m/chardev.c index c7bc8d191..6ed964604 100644 --- a/libplatsupport/src/plat/imx8m/chardev.c +++ b/libplatsupport/src/plat/imx8m/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/imx8m/clock.c b/libplatsupport/src/plat/imx8m/clock.c index 177b3ac39..9d9192c08 100644 --- a/libplatsupport/src/plat/imx8m/clock.c +++ b/libplatsupport/src/plat/imx8m/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/odroidc2/chardev.c b/libplatsupport/src/plat/odroidc2/chardev.c index dd181477c..cccf4649b 100644 --- a/libplatsupport/src/plat/odroidc2/chardev.c +++ b/libplatsupport/src/plat/odroidc2/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/odroidc2/ltimer.c b/libplatsupport/src/plat/odroidc2/ltimer.c index 5cf033ab9..81bedb2ad 100644 --- a/libplatsupport/src/plat/odroidc2/ltimer.c +++ b/libplatsupport/src/plat/odroidc2/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/odroidc2/meson_timer.c b/libplatsupport/src/plat/odroidc2/meson_timer.c index 3bf160831..409095fed 100644 --- a/libplatsupport/src/plat/odroidc2/meson_timer.c +++ b/libplatsupport/src/plat/odroidc2/meson_timer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/odroidc2/serial.c b/libplatsupport/src/plat/odroidc2/serial.c index c7c413575..92cd38865 100644 --- a/libplatsupport/src/plat/odroidc2/serial.c +++ b/libplatsupport/src/plat/odroidc2/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/omap3/chardev.c b/libplatsupport/src/plat/omap3/chardev.c index 6280e2b37..34b29b4ca 100644 --- a/libplatsupport/src/plat/omap3/chardev.c +++ b/libplatsupport/src/plat/omap3/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* diff --git a/libplatsupport/src/plat/omap3/clock.c b/libplatsupport/src/plat/omap3/clock.c index 42cb4829c..0d1805885 100644 --- a/libplatsupport/src/plat/omap3/clock.c +++ b/libplatsupport/src/plat/omap3/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../arch/arm/clock.h" #include "../../services.h" diff --git a/libplatsupport/src/plat/omap3/mux.c b/libplatsupport/src/plat/omap3/mux.c index 747073394..1d458e183 100644 --- a/libplatsupport/src/plat/omap3/mux.c +++ b/libplatsupport/src/plat/omap3/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/omap3/serial.c b/libplatsupport/src/plat/omap3/serial.c index 201bf365e..25bbdcffd 100644 --- a/libplatsupport/src/plat/omap3/serial.c +++ b/libplatsupport/src/plat/omap3/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../chardev.h" diff --git a/libplatsupport/src/plat/omap3/timerdev.h b/libplatsupport/src/plat/omap3/timerdev.h index 1dd3f8fdd..8ebf7ec0d 100644 --- a/libplatsupport/src/plat/omap3/timerdev.h +++ b/libplatsupport/src/plat/omap3/timerdev.h @@ -1,11 +1,5 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/libplatsupport/src/plat/pc99/acpi/acpi.c b/libplatsupport/src/plat/pc99/acpi/acpi.c index 01a908e13..0e99d1f2d 100644 --- a/libplatsupport/src/plat/pc99/acpi/acpi.c +++ b/libplatsupport/src/plat/pc99/acpi/acpi.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/pc99/acpi/acpi.h b/libplatsupport/src/plat/pc99/acpi/acpi.h index 32bbe520b..11037625c 100644 --- a/libplatsupport/src/plat/pc99/acpi/acpi.h +++ b/libplatsupport/src/plat/pc99/acpi/acpi.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* diff --git a/libplatsupport/src/plat/pc99/acpi/browser.c b/libplatsupport/src/plat/pc99/acpi/browser.c index 363a18c23..48c28f630 100644 --- a/libplatsupport/src/plat/pc99/acpi/browser.c +++ b/libplatsupport/src/plat/pc99/acpi/browser.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "browser.h" diff --git a/libplatsupport/src/plat/pc99/acpi/browser.h b/libplatsupport/src/plat/pc99/acpi/browser.h index 7699d8752..2d2f205cb 100644 --- a/libplatsupport/src/plat/pc99/acpi/browser.h +++ b/libplatsupport/src/plat/pc99/acpi/browser.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/pc99/acpi/printer.c b/libplatsupport/src/plat/pc99/acpi/printer.c index 81415c98c..76d8c1852 100644 --- a/libplatsupport/src/plat/pc99/acpi/printer.c +++ b/libplatsupport/src/plat/pc99/acpi/printer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "printer.h" diff --git a/libplatsupport/src/plat/pc99/acpi/printer.h b/libplatsupport/src/plat/pc99/acpi/printer.h index 8e34aac40..b303f85f3 100644 --- a/libplatsupport/src/plat/pc99/acpi/printer.h +++ b/libplatsupport/src/plat/pc99/acpi/printer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/pc99/acpi/regions.c b/libplatsupport/src/plat/pc99/acpi/regions.c index bfdc4d3c9..18d438c1d 100644 --- a/libplatsupport/src/plat/pc99/acpi/regions.c +++ b/libplatsupport/src/plat/pc99/acpi/regions.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/pc99/acpi/regions.h b/libplatsupport/src/plat/pc99/acpi/regions.h index 728d8ae62..92fc9d90d 100644 --- a/libplatsupport/src/plat/pc99/acpi/regions.h +++ b/libplatsupport/src/plat/pc99/acpi/regions.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/pc99/acpi/walker.c b/libplatsupport/src/plat/pc99/acpi/walker.c index 5b3b05038..9e0f87137 100644 --- a/libplatsupport/src/plat/pc99/acpi/walker.c +++ b/libplatsupport/src/plat/pc99/acpi/walker.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/pc99/acpi/walker.h b/libplatsupport/src/plat/pc99/acpi/walker.h index 64fa036b3..5f29a88de 100644 --- a/libplatsupport/src/plat/pc99/acpi/walker.h +++ b/libplatsupport/src/plat/pc99/acpi/walker.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/pc99/chardev.c b/libplatsupport/src/plat/pc99/chardev.c index 67a92772c..561f9d089 100644 --- a/libplatsupport/src/plat/pc99/chardev.c +++ b/libplatsupport/src/plat/pc99/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* diff --git a/libplatsupport/src/plat/pc99/ega.c b/libplatsupport/src/plat/pc99/ega.c index 129766691..5133820dd 100644 --- a/libplatsupport/src/plat/pc99/ega.c +++ b/libplatsupport/src/plat/pc99/ega.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* * Implementation of an 80x25 EGA text mode. All the functions are named with 'serial' since diff --git a/libplatsupport/src/plat/pc99/ega.h b/libplatsupport/src/plat/pc99/ega.h index 084bc1590..92efd012b 100644 --- a/libplatsupport/src/plat/pc99/ega.h +++ b/libplatsupport/src/plat/pc99/ega.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/pc99/hpet.c b/libplatsupport/src/plat/pc99/hpet.c index 0fa7a53ab..816ff645b 100644 --- a/libplatsupport/src/plat/pc99/hpet.c +++ b/libplatsupport/src/plat/pc99/hpet.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/pc99/keyboard_chardev.c b/libplatsupport/src/plat/pc99/keyboard_chardev.c index 4dc95f79b..442fa1863 100644 --- a/libplatsupport/src/plat/pc99/keyboard_chardev.c +++ b/libplatsupport/src/plat/pc99/keyboard_chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "keyboard_chardev.h" diff --git a/libplatsupport/src/plat/pc99/keyboard_chardev.h b/libplatsupport/src/plat/pc99/keyboard_chardev.h index aa69380cb..d99667d15 100644 --- a/libplatsupport/src/plat/pc99/keyboard_chardev.h +++ b/libplatsupport/src/plat/pc99/keyboard_chardev.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/pc99/keyboard_ps2.c b/libplatsupport/src/plat/pc99/keyboard_ps2.c index 728262d68..964c6dd16 100644 --- a/libplatsupport/src/plat/pc99/keyboard_ps2.c +++ b/libplatsupport/src/plat/pc99/keyboard_ps2.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "keyboard_ps2.h" diff --git a/libplatsupport/src/plat/pc99/keyboard_ps2.h b/libplatsupport/src/plat/pc99/keyboard_ps2.h index 92aa85c1b..c533a3b6f 100644 --- a/libplatsupport/src/plat/pc99/keyboard_ps2.h +++ b/libplatsupport/src/plat/pc99/keyboard_ps2.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/pc99/keyboard_vkey.c b/libplatsupport/src/plat/pc99/keyboard_vkey.c index b41d6ef1b..008ae9cec 100644 --- a/libplatsupport/src/plat/pc99/keyboard_vkey.c +++ b/libplatsupport/src/plat/pc99/keyboard_vkey.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "keyboard_vkey.h" diff --git a/libplatsupport/src/plat/pc99/keyboard_vkey.h b/libplatsupport/src/plat/pc99/keyboard_vkey.h index 308d46b98..cccbe93db 100644 --- a/libplatsupport/src/plat/pc99/keyboard_vkey.h +++ b/libplatsupport/src/plat/pc99/keyboard_vkey.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/pc99/ltimer.c b/libplatsupport/src/plat/pc99/ltimer.c index f93f1a824..cff1a1983 100644 --- a/libplatsupport/src/plat/pc99/ltimer.c +++ b/libplatsupport/src/plat/pc99/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Implementation of a logical timer for pc99 platforms * diff --git a/libplatsupport/src/plat/pc99/pit.c b/libplatsupport/src/plat/pc99/pit.c index 3f986b25a..513e032e7 100644 --- a/libplatsupport/src/plat/pc99/pit.c +++ b/libplatsupport/src/plat/pc99/pit.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/pc99/rtc.c b/libplatsupport/src/plat/pc99/rtc.c index 9d78b4392..7e02576a4 100644 --- a/libplatsupport/src/plat/pc99/rtc.c +++ b/libplatsupport/src/plat/pc99/rtc.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Some code from here was taken from http://wiki.osdev.org/CMOS diff --git a/libplatsupport/src/plat/pc99/serial.c b/libplatsupport/src/plat/pc99/serial.c index da31d1a07..22888c803 100644 --- a/libplatsupport/src/plat/pc99/serial.c +++ b/libplatsupport/src/plat/pc99/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/polarfire/chardev.c b/libplatsupport/src/plat/polarfire/chardev.c index 835ff0a27..743fb7e1e 100644 --- a/libplatsupport/src/plat/polarfire/chardev.c +++ b/libplatsupport/src/plat/polarfire/chardev.c @@ -1,11 +1,7 @@ /* * Copyright 2020, DornerWorks * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DORNERWORKS_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/polarfire/uart.c b/libplatsupport/src/plat/polarfire/uart.c index de7182b19..6ad4ec6fd 100644 --- a/libplatsupport/src/plat/polarfire/uart.c +++ b/libplatsupport/src/plat/polarfire/uart.c @@ -1,11 +1,7 @@ /* * Copyright 2020, DornerWorks * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DORNERWORKS_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/qemu-arm-virt/chardev.c b/libplatsupport/src/plat/qemu-arm-virt/chardev.c index b323fc649..2a4407403 100644 --- a/libplatsupport/src/plat/qemu-arm-virt/chardev.c +++ b/libplatsupport/src/plat/qemu-arm-virt/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/qemu-arm-virt/serial.c b/libplatsupport/src/plat/qemu-arm-virt/serial.c index 260d70492..47b665e16 100644 --- a/libplatsupport/src/plat/qemu-arm-virt/serial.c +++ b/libplatsupport/src/plat/qemu-arm-virt/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Mostly copy/paste from the HiKey plat. diff --git a/libplatsupport/src/plat/rocketchip/chardev.c b/libplatsupport/src/plat/rocketchip/chardev.c index 3b54e7a4d..0ad021ddc 100644 --- a/libplatsupport/src/plat/rocketchip/chardev.c +++ b/libplatsupport/src/plat/rocketchip/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../chardev.h" diff --git a/libplatsupport/src/plat/rocketchip/serial.c b/libplatsupport/src/plat/rocketchip/serial.c index 47b24c2f6..921b15139 100644 --- a/libplatsupport/src/plat/rocketchip/serial.c +++ b/libplatsupport/src/plat/rocketchip/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/rockpro64/chardev.c b/libplatsupport/src/plat/rockpro64/chardev.c index 6bf3d7c35..c6885bf9b 100644 --- a/libplatsupport/src/plat/rockpro64/chardev.c +++ b/libplatsupport/src/plat/rockpro64/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libplatsupport/src/plat/rockpro64/ltimer.c b/libplatsupport/src/plat/rockpro64/ltimer.c index 1a675144b..df9c169ce 100644 --- a/libplatsupport/src/plat/rockpro64/ltimer.c +++ b/libplatsupport/src/plat/rockpro64/ltimer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Implementation of a logical timer for rockpro64 diff --git a/libplatsupport/src/plat/rockpro64/serial.c b/libplatsupport/src/plat/rockpro64/serial.c index 7b4a808f2..a7a246250 100644 --- a/libplatsupport/src/plat/rockpro64/serial.c +++ b/libplatsupport/src/plat/rockpro64/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/rockpro64/timer.c b/libplatsupport/src/plat/rockpro64/timer.c index d3f6baf09..b9f8562f5 100644 --- a/libplatsupport/src/plat/rockpro64/timer.c +++ b/libplatsupport/src/plat/rockpro64/timer.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/spike/chardev.c b/libplatsupport/src/plat/spike/chardev.c index 9690fc004..5cffafc4a 100644 --- a/libplatsupport/src/plat/spike/chardev.c +++ b/libplatsupport/src/plat/spike/chardev.c @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "../../chardev.h" #include "../../common.h" diff --git a/libplatsupport/src/plat/spike/serial.c b/libplatsupport/src/plat/spike/serial.c index aa2b0e73f..182366a55 100644 --- a/libplatsupport/src/plat/spike/serial.c +++ b/libplatsupport/src/plat/spike/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/tk1/clock.c b/libplatsupport/src/plat/tk1/clock.c index 4cb01d030..8836ca9f2 100644 --- a/libplatsupport/src/plat/tk1/clock.c +++ b/libplatsupport/src/plat/tk1/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/tk1/gpio.c b/libplatsupport/src/plat/tk1/gpio.c index 6d7e81755..c4d28fc47 100644 --- a/libplatsupport/src/plat/tk1/gpio.c +++ b/libplatsupport/src/plat/tk1/gpio.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/tk1/i2c.c b/libplatsupport/src/plat/tk1/i2c.c index 9f1bdf6d8..47b78d34c 100644 --- a/libplatsupport/src/plat/tk1/i2c.c +++ b/libplatsupport/src/plat/tk1/i2c.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libplatsupport/src/plat/tk1/mux.c b/libplatsupport/src/plat/tk1/mux.c index 58567c186..8f28564d4 100644 --- a/libplatsupport/src/plat/tk1/mux.c +++ b/libplatsupport/src/plat/tk1/mux.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/tk1/mux_gpio_priv.h b/libplatsupport/src/plat/tk1/mux_gpio_priv.h index e5f4bb011..82b256a1f 100644 --- a/libplatsupport/src/plat/tk1/mux_gpio_priv.h +++ b/libplatsupport/src/plat/tk1/mux_gpio_priv.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/tk1/mux_gpio_shared.c b/libplatsupport/src/plat/tk1/mux_gpio_shared.c index 682396840..b6c1d4e2f 100644 --- a/libplatsupport/src/plat/tk1/mux_gpio_shared.c +++ b/libplatsupport/src/plat/tk1/mux_gpio_shared.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/tk1/spi.c b/libplatsupport/src/plat/tk1/spi.c index d6e2043a4..dd2147238 100644 --- a/libplatsupport/src/plat/tk1/spi.c +++ b/libplatsupport/src/plat/tk1/spi.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/tx2/clock.c b/libplatsupport/src/plat/tx2/clock.c index f834e2973..a760d5aad 100644 --- a/libplatsupport/src/plat/tx2/clock.c +++ b/libplatsupport/src/plat/tx2/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2019, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2019, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/zynq7000/clock.c b/libplatsupport/src/plat/zynq7000/clock.c index 153a46d98..73a0ffbb0 100644 --- a/libplatsupport/src/plat/zynq7000/clock.c +++ b/libplatsupport/src/plat/zynq7000/clock.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "src.h" #include "../../arch/arm/clock.h" diff --git a/libplatsupport/src/plat/zynq7000/devcfg.c b/libplatsupport/src/plat/zynq7000/devcfg.c index 3bf1e00d8..0b297f669 100644 --- a/libplatsupport/src/plat/zynq7000/devcfg.c +++ b/libplatsupport/src/plat/zynq7000/devcfg.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/zynq7000/devcfg.h b/libplatsupport/src/plat/zynq7000/devcfg.h index 491465d8c..7fb015a81 100644 --- a/libplatsupport/src/plat/zynq7000/devcfg.h +++ b/libplatsupport/src/plat/zynq7000/devcfg.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/zynq7000/src.c b/libplatsupport/src/plat/zynq7000/src.c index b8d8138e4..b34ae1019 100644 --- a/libplatsupport/src/plat/zynq7000/src.c +++ b/libplatsupport/src/plat/zynq7000/src.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include "src.h" diff --git a/libplatsupport/src/plat/zynq7000/src.h b/libplatsupport/src/plat/zynq7000/src.h index 6c7339311..d6d9c8514 100644 --- a/libplatsupport/src/plat/zynq7000/src.h +++ b/libplatsupport/src/plat/zynq7000/src.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/zynq7000/tmu.c b/libplatsupport/src/plat/zynq7000/tmu.c index 4b1ebfec7..70b6c578f 100644 --- a/libplatsupport/src/plat/zynq7000/tmu.c +++ b/libplatsupport/src/plat/zynq7000/tmu.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/zynq7000/xadc.c b/libplatsupport/src/plat/zynq7000/xadc.c index bf72685ad..13f875c8d 100644 --- a/libplatsupport/src/plat/zynq7000/xadc.c +++ b/libplatsupport/src/plat/zynq7000/xadc.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/plat/zynq7000/xadc.h b/libplatsupport/src/plat/zynq7000/xadc.h index a5842fb65..0b39cef85 100644 --- a/libplatsupport/src/plat/zynq7000/xadc.h +++ b/libplatsupport/src/plat/zynq7000/xadc.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/plat/zynqmp/clock.c b/libplatsupport/src/plat/zynqmp/clock.c index 50b295f58..33be9bfa9 100644 --- a/libplatsupport/src/plat/zynqmp/clock.c +++ b/libplatsupport/src/plat/zynqmp/clock.c @@ -1,12 +1,9 @@ /* * Copyright 2017, DornerWorks * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DORNERWORKS_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ + /* * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under * a DARPA SBIR, Contract Number D16PC00107. diff --git a/libplatsupport/src/serial.c b/libplatsupport/src/serial.c index 7f346cf21..2b356ce47 100644 --- a/libplatsupport/src/serial.c +++ b/libplatsupport/src/serial.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/src/services.h b/libplatsupport/src/services.h index 5cea5e1b7..e17bc0054 100644 --- a/libplatsupport/src/services.h +++ b/libplatsupport/src/services.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libplatsupport/src/tqueue.c b/libplatsupport/src/tqueue.c index b0f3e66ba..50e6b9c69 100644 --- a/libplatsupport/src/tqueue.c +++ b/libplatsupport/src/tqueue.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libplatsupport/tools/device_header_gen.py b/libplatsupport/tools/device_header_gen.py index fe603a719..0d0dd4fe7 100644 --- a/libplatsupport/tools/device_header_gen.py +++ b/libplatsupport/tools/device_header_gen.py @@ -1,15 +1,9 @@ #!/usr/bin/env python3 # -# Copyright 2020, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # import builtins @@ -21,15 +15,9 @@ from jinja2 import Environment, BaseLoader HEADER_TEMPLATE = '''/* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. - * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* This file is auto-generated by device_header_gen.py in libplatsupport. */ diff --git a/libplatsupport/tools/device_lists/gpio/exynos5422.yaml b/libplatsupport/tools/device_lists/gpio/exynos5422.yaml index 1264ffd18..0cc904376 100644 --- a/libplatsupport/tools/device_lists/gpio/exynos5422.yaml +++ b/libplatsupport/tools/device_lists/gpio/exynos5422.yaml @@ -1,13 +1,7 @@ # -# Copyright 2020, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # # List of GPIO pins for the Exynos5422 platform diff --git a/libplatsupport/tools/helpers.cmake b/libplatsupport/tools/helpers.cmake index 991abadac..64622f6de 100644 --- a/libplatsupport/tools/helpers.cmake +++ b/libplatsupport/tools/helpers.cmake @@ -1,13 +1,7 @@ # -# Copyright 2020, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.8.2) diff --git a/libutils/CMakeLists.txt b/libutils/CMakeLists.txt index 576405a26..42cb80790 100644 --- a/libutils/CMakeLists.txt +++ b/libutils/CMakeLists.txt @@ -1,13 +1,7 @@ # -# Copyright 2017, Data61 -# Commonwealth Scientific and Industrial Research Organisation (CSIRO) -# ABN 41 687 119 230. +# Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) # -# This software may be distributed and modified according to the terms of -# the BSD 2-Clause license. Note that NO WARRANTY is provided. -# See "LICENSE_BSD2.txt" for details. -# -# @TAG(DATA61_BSD) +# SPDX-License-Identifier: BSD-2-Clause # cmake_minimum_required(VERSION 3.7.2) diff --git a/libutils/LICENSE_BSD2.txt b/libutils/LICENSE_BSD2.txt deleted file mode 100644 index 982302060..000000000 --- a/libutils/LICENSE_BSD2.txt +++ /dev/null @@ -1,30 +0,0 @@ -Files described as being under the "BSD 2-Clause" license fall under the -following license. - ------------------------------------------------------------------------ - -Copyright (c) 2014 National ICT Australia and other contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/libutils/arch_include/arm/utils/arch/io.h b/libutils/arch_include/arm/utils/arch/io.h index e1de6374f..206eeef0f 100644 --- a/libutils/arch_include/arm/utils/arch/io.h +++ b/libutils/arch_include/arm/utils/arch/io.h @@ -1,14 +1,8 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * -* @TAG(DATA61_BSD) -*/ + * SPDX-License-Identifier: BSD-2-Clause + */ #pragma once diff --git a/libutils/arch_include/arm/utils/arch/stack.h b/libutils/arch_include/arm/utils/arch/stack.h index 816683268..fd386caa9 100644 --- a/libutils/arch_include/arm/utils/arch/stack.h +++ b/libutils/arch_include/arm/utils/arch/stack.h @@ -1,14 +1,8 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - *# @TAG(DATA61_BSD) - #*/ + * SPDX-License-Identifier: BSD-2-Clause + */ #pragma once diff --git a/libutils/arch_include/arm/utils/arch/ud.h b/libutils/arch_include/arm/utils/arch/ud.h index 295087357..dfb1a9ae1 100644 --- a/libutils/arch_include/arm/utils/arch/ud.h +++ b/libutils/arch_include/arm/utils/arch/ud.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/arch_include/riscv/utils/arch/stack.h b/libutils/arch_include/riscv/utils/arch/stack.h index 498621d55..7eb74b2a6 100644 --- a/libutils/arch_include/riscv/utils/arch/stack.h +++ b/libutils/arch_include/riscv/utils/arch/stack.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/arch_include/riscv/utils/arch/ud.h b/libutils/arch_include/riscv/utils/arch/ud.h index f4e172377..8c471f0a0 100644 --- a/libutils/arch_include/riscv/utils/arch/ud.h +++ b/libutils/arch_include/riscv/utils/arch/ud.h @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/arch_include/x86/utils/arch/stack.h b/libutils/arch_include/x86/utils/arch/stack.h index 9f7ed7dd3..cb8e1fe0f 100644 --- a/libutils/arch_include/x86/utils/arch/stack.h +++ b/libutils/arch_include/x86/utils/arch/stack.h @@ -1,14 +1,8 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - *# @TAG(DATA61_BSD) - #*/ + * SPDX-License-Identifier: BSD-2-Clause + */ #pragma once diff --git a/libutils/arch_include/x86/utils/arch/ud.h b/libutils/arch_include/x86/utils/arch/ud.h index 72c8a89ed..e42feaea5 100644 --- a/libutils/arch_include/x86/utils/arch/ud.h +++ b/libutils/arch_include/x86/utils/arch/ud.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/doc/ZFLOG.md b/libutils/doc/ZFLOG.md index 73c260889..754f50ab1 100644 --- a/libutils/doc/ZFLOG.md +++ b/libutils/doc/ZFLOG.md @@ -1,4 +1,8 @@ -/* @TAG(CUSTOM) */ + + zf_log ======== diff --git a/libutils/doc/sglib.html b/libutils/doc/sglib.html index c42f37f45..5f1d5a8bc 100644 --- a/libutils/doc/sglib.html +++ b/libutils/doc/sglib.html @@ -1,4 +1,12 @@ - + + diff --git a/libutils/include/utils/ansi.h b/libutils/include/utils/ansi.h index 21a458ce8..8ea527fcc 100644 --- a/libutils/include/utils/ansi.h +++ b/libutils/include/utils/ansi.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/ansi_color.h b/libutils/include/utils/ansi_color.h index f2f67f42d..79e7e8b94 100644 --- a/libutils/include/utils/ansi_color.h +++ b/libutils/include/utils/ansi_color.h @@ -1,4 +1,5 @@ -/* @TAG(CUSTOM) */ +/* SPDX-License-Identifier: MIT */ + /* Copyright (c) 2012, Ryan Fox * * Permission is hereby granted, free of charge, to any person obtaining diff --git a/libutils/include/utils/arith.h b/libutils/include/utils/arith.h index 268a3a630..55a6e94a2 100644 --- a/libutils/include/utils/arith.h +++ b/libutils/include/utils/arith.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/assume.h b/libutils/include/utils/assume.h index ead93aa57..90ec6f16a 100644 --- a/libutils/include/utils/assume.h +++ b/libutils/include/utils/assume.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/attribute.h b/libutils/include/utils/attribute.h index 6218a2c2c..b33cdb708 100644 --- a/libutils/include/utils/attribute.h +++ b/libutils/include/utils/attribute.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/auto.h b/libutils/include/utils/auto.h index b87726a26..768e77af2 100644 --- a/libutils/include/utils/auto.h +++ b/libutils/include/utils/auto.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/base64.h b/libutils/include/utils/base64.h index 923cab98f..c79790a44 100644 --- a/libutils/include/utils/base64.h +++ b/libutils/include/utils/base64.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/builtin.h b/libutils/include/utils/builtin.h index e3442d558..4af7e0c76 100644 --- a/libutils/include/utils/builtin.h +++ b/libutils/include/utils/builtin.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/cbor64.h b/libutils/include/utils/cbor64.h index 22243fa10..42a2ae682 100644 --- a/libutils/include/utils/cbor64.h +++ b/libutils/include/utils/cbor64.h @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/circular_buffer.h b/libutils/include/utils/circular_buffer.h index b2812930f..52d41e1f4 100644 --- a/libutils/include/utils/circular_buffer.h +++ b/libutils/include/utils/circular_buffer.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /** diff --git a/libutils/include/utils/colour.h b/libutils/include/utils/colour.h index 47794c5c0..4722d7252 100644 --- a/libutils/include/utils/colour.h +++ b/libutils/include/utils/colour.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/compile_time.h b/libutils/include/utils/compile_time.h index 434cca6a3..756abfde4 100644 --- a/libutils/include/utils/compile_time.h +++ b/libutils/include/utils/compile_time.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/config.h b/libutils/include/utils/config.h index e83435e4b..3340af4dd 100644 --- a/libutils/include/utils/config.h +++ b/libutils/include/utils/config.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_GPL) + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/libutils/include/utils/debug.h b/libutils/include/utils/debug.h index b7496870b..8daf17e1a 100644 --- a/libutils/include/utils/debug.h +++ b/libutils/include/utils/debug.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/fence.h b/libutils/include/utils/fence.h index 7d7564e86..2baaaab4a 100644 --- a/libutils/include/utils/fence.h +++ b/libutils/include/utils/fence.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/force.h b/libutils/include/utils/force.h index d115b765a..5424985dc 100644 --- a/libutils/include/utils/force.h +++ b/libutils/include/utils/force.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/formats.h b/libutils/include/utils/formats.h index 5bac3f4c7..8f9d3d1e8 100644 --- a/libutils/include/utils/formats.h +++ b/libutils/include/utils/formats.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/frequency.h b/libutils/include/utils/frequency.h index 30a0e38ad..cf8c878fd 100644 --- a/libutils/include/utils/frequency.h +++ b/libutils/include/utils/frequency.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/io.h b/libutils/include/utils/io.h index bb04d2814..0bd7e45f0 100644 --- a/libutils/include/utils/io.h +++ b/libutils/include/utils/io.h @@ -1,14 +1,8 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * -* @TAG(DATA61_BSD) -*/ + * SPDX-License-Identifier: BSD-2-Clause + */ #pragma once diff --git a/libutils/include/utils/linear_algebra.h b/libutils/include/utils/linear_algebra.h index 6bea10d3e..127925863 100644 --- a/libutils/include/utils/linear_algebra.h +++ b/libutils/include/utils/linear_algebra.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* A simple vector math library diff --git a/libutils/include/utils/list.h b/libutils/include/utils/list.h index e5fec727f..57285fa65 100644 --- a/libutils/include/utils/list.h +++ b/libutils/include/utils/list.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Bog standard singly-linked-list implementation. */ diff --git a/libutils/include/utils/math.h b/libutils/include/utils/math.h index 2714e2be7..dd3fc3e61 100644 --- a/libutils/include/utils/math.h +++ b/libutils/include/utils/math.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/page.h b/libutils/include/utils/page.h index b928c86f9..1fce30392 100644 --- a/libutils/include/utils/page.h +++ b/libutils/include/utils/page.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/print.h b/libutils/include/utils/print.h index 6509aec04..653891785 100644 --- a/libutils/include/utils/print.h +++ b/libutils/include/utils/print.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/sglib.h b/libutils/include/utils/sglib.h index 607d6f04e..d409f8723 100644 --- a/libutils/include/utils/sglib.h +++ b/libutils/include/utils/sglib.h @@ -1,4 +1,12 @@ -/* @TAG(CUSTOM) */ +/* + * Copyright Marian Vittek + * SPDX-License-Identifier: BSD-2-Clause + * + * http://sglib.sourceforge.net/#license says "you can use Sglib under the terms + * of any license defined as an open source license by the Open Source Initiative + * (see http://www.opensource.org/)" + */ + /* This is SGLIB version 1.0.4 diff --git a/libutils/include/utils/stack.h b/libutils/include/utils/stack.h index fa98511ab..e08cd77ff 100644 --- a/libutils/include/utils/stack.h +++ b/libutils/include/utils/stack.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/stringify.h b/libutils/include/utils/stringify.h index aff8214bb..6efb93371 100644 --- a/libutils/include/utils/stringify.h +++ b/libutils/include/utils/stringify.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Macros related to string- and token-construction operations. */ diff --git a/libutils/include/utils/temperature.h b/libutils/include/utils/temperature.h index 63775ce7c..3d5273181 100644 --- a/libutils/include/utils/temperature.h +++ b/libutils/include/utils/temperature.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/time.h b/libutils/include/utils/time.h index d602417e8..fd4f7f816 100644 --- a/libutils/include/utils/time.h +++ b/libutils/include/utils/time.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/ud.h b/libutils/include/utils/ud.h index 65ecd9cad..ddeab8d6b 100644 --- a/libutils/include/utils/ud.h +++ b/libutils/include/utils/ud.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/uthash.h b/libutils/include/utils/uthash.h index 8c04f2dd3..44aeaa434 100644 --- a/libutils/include/utils/uthash.h +++ b/libutils/include/utils/uthash.h @@ -1,4 +1,4 @@ -/* @TAG(OTHER_NON_STANDARD) */ +/* SPDX-License-Identifier: BSD-1-Clause */ /* Copyright (c) 2003-2018, Troy D. Hanson http://troydhanson.github.com/uthash/ All rights reserved. diff --git a/libutils/include/utils/util.h b/libutils/include/utils/util.h index 9e75ace68..735dee3e1 100644 --- a/libutils/include/utils/util.h +++ b/libutils/include/utils/util.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/verification.h b/libutils/include/utils/verification.h index 6d6585c67..3dbb97257 100644 --- a/libutils/include/utils/verification.h +++ b/libutils/include/utils/verification.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/xml.h b/libutils/include/utils/xml.h index 04e4aa0eb..450ba4221 100644 --- a/libutils/include/utils/xml.h +++ b/libutils/include/utils/xml.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ /* Basic XML-related functionality. If this ever grows beyond simple helpers, we should switch to diff --git a/libutils/include/utils/zf_log.h b/libutils/include/utils/zf_log.h index a1fe8c863..68c2cc004 100644 --- a/libutils/include/utils/zf_log.h +++ b/libutils/include/utils/zf_log.h @@ -1,5 +1,8 @@ -/* @TAG(CUSTOM) */ -/* zf log taken from: https://github.com/wonder-mice/zf_log +/* + * SPDX-License-Identifier: MIT + * Copyright (c) 2017 wonder-mice + * + * zf log taken from: https://github.com/wonder-mice/zf_log * * "Software source code can not be printed on paper and sticked to a cat." */ diff --git a/libutils/include/utils/zf_log_config.h b/libutils/include/utils/zf_log_config.h index 48e03e295..a06849df8 100644 --- a/libutils/include/utils/zf_log_config.h +++ b/libutils/include/utils/zf_log_config.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/include/utils/zf_log_if.h b/libutils/include/utils/zf_log_if.h index f7653fb03..55430c9a7 100644 --- a/libutils/include/utils/zf_log_if.h +++ b/libutils/include/utils/zf_log_if.h @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #pragma once diff --git a/libutils/src/arch/arm/stack.c b/libutils/src/arch/arm/stack.c index af34ec255..f798a8bf8 100644 --- a/libutils/src/arch/arm/stack.c +++ b/libutils/src/arch/arm/stack.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libutils/src/arch/riscv/stack.c b/libutils/src/arch/riscv/stack.c index d96df0d8c..890755b53 100644 --- a/libutils/src/arch/riscv/stack.c +++ b/libutils/src/arch/riscv/stack.c @@ -1,13 +1,7 @@ /* - * Copyright 2018, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2018, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libutils/src/arch/x86/stack.c b/libutils/src/arch/x86/stack.c index 1d8de7b7b..bf18c6484 100644 --- a/libutils/src/arch/x86/stack.c +++ b/libutils/src/arch/x86/stack.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libutils/src/cbor64.c b/libutils/src/cbor64.c index b4a21f401..e33227e10 100644 --- a/libutils/src/cbor64.c +++ b/libutils/src/cbor64.c @@ -1,13 +1,7 @@ /* - * Copyright 2020, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libutils/src/debug.c b/libutils/src/debug.c index 97ce69fdd..f5d7955d1 100644 --- a/libutils/src/debug.c +++ b/libutils/src/debug.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include #include diff --git a/libutils/src/list.c b/libutils/src/list.c index 6e8d8c2da..08a42301d 100644 --- a/libutils/src/list.c +++ b/libutils/src/list.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libutils/src/xml.c b/libutils/src/xml.c index 08037359c..4d3aaf6c4 100644 --- a/libutils/src/xml.c +++ b/libutils/src/xml.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/libutils/src/zf_log.c b/libutils/src/zf_log.c index 674226305..afa9d14a5 100644 --- a/libutils/src/zf_log.c +++ b/libutils/src/zf_log.c @@ -1,13 +1,7 @@ /* - * Copyright 2017, Data61 - * Commonwealth Scientific and Industrial Research Organisation (CSIRO) - * ABN 41 687 119 230. + * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230) * - * This software may be distributed and modified according to the terms of - * the BSD 2-Clause license. Note that NO WARRANTY is provided. - * See "LICENSE_BSD2.txt" for details. - * - * @TAG(DATA61_BSD) + * SPDX-License-Identifier: BSD-2-Clause */ #include