This commit was manufactured by cvs2svn to create tag 'rtems-4-5-1-pre3'.

Sprout from rtems-4-5-branch 2002-01-30 20:04:25 UTC cvs2git <rtems-devel@rtems.org> 'This commit was manufactured by cvs2svn to create branch 'rtems-4-5-branch'.'
Cherrypick from rtems-4-5-branch 2001-08-30 19:12:24 UTC Joel Sherrill <joel.sherrill@OARcorp.com> 'changed version to 4.5.1-pre1':
    VERSION
    c/src/lib/libc/termios.c
Cherrypick from master 1999-03-31 23:21:19 UTC Joel Sherrill <joel.sherrill@OARcorp.com> 'Fixed paths to include files so this will build.':
    c/src/lib/libcpu/mips/clock/clock.S
Cherrypick from master 2002-01-22 17:38:37 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2002-01-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>':
    doc/.cvsignore

.cvsignore

@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+aclocal.m4
+config.cache
+config.log
+config.status
+configure
+depcomp

.gitignore

@@ -1,6 +0,0 @@
-aclocal.m4
-autom4te.cache
-configure
-config.h.in
-Makefile.in
-doc

COPYING

@@ -0,0 +1,343 @@
+#
+# $Id$
+#
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 Library 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
+
+	Appendix: 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 a brief idea of what it does.>
+    Copyright (C) 19yy  <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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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) 19yy 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
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

INSTALL

@@ -1,4 +1,51 @@
+#
+#  $Id$
+#
+
 Building RTEMS
 ==============
-See the documentation referred to in the README.
+See the file README.configure.
+
+
+UNCOMPRESSING .tgz FILES
+===========================
+Many of the files found in this directory and its subdirectories 
+are gzip'ed, tar archive files.  These files have the ".tgz"
+extension.  They were compressed with gzip version 1.2.4.  
+
+Use a command sequence similar to the following to uncompress each
+file:
+
+   gzcat FILE.tgz | tar xvof -
+
+where FILE.tgz is the file to be installed.  This procedure will
+extract the files in the archive into the current directory.
+All of the .tgz files associated with this release RTEMS will
+place their contents in a subdirectory rtems-<release> in the current
+directory.
+
+If you are unsure of what is in an RTEMS archive file, then use
+the following command sequence to get a listing of the contents:
+
+   gzcat FILE.tgz | tar tvf -
+
+NOTES:  
+
+(1) The "-o" option to tar is included on the tar command line
+    so that the user extracting the tar archive will own the extracted
+    files.
+
+(2) gzcat is sometimes installed as zcat.  Be warned that on many
+    (most) UNIX machines, zcat is associated with compress (.Z files).
+
+(3) If you do not have gzip 1.2.4, it is available from numerous sites
+    including this one.  Other sites include ftp.gnu.org and ftp.cdrom.com.
+    
+(4) The GNU archive files included in this distribution are packaged
+    exactly like they are on official GNU ftp sites.  When extracting
+    GNU archives, they will not extract under a rtems-<version> 
+    directory.  They will extract themselves under a directory which
+    is the name and version of the tool in question.  For example,
+    gcc-2.5.8.tgz will extract its contents into the subdirectory 
+    gcc-2.5.8.
 

LICENSE

@@ -1,3 +1,6 @@
+#
+#  $Id$
+# 
                       LICENSE INFORMATION
 
 RTEMS is free software; you can redistribute it and/or modify it under

LICENSE.BSD-2-Clause

@@ -1,51 +0,0 @@
-https://spdx.org/licenses/BSD-2-Clause.html
-
-This license file serves as a template for the license header in files.
-
-You are the copyright holder.  Copy the comment below the top of the file in
-which you want to use this license for your contribution.  Replace the
-<FIRST YEAR> placeholder with the year of your first substantial contribution
-to this file.  Update the <LAST YEAR> with the year of your last substantial
-contribution to this file.  If the first and last years are the same, then
-remove the <LAST YEAR> placeholder with the comma.  Replace the
-<COPYRIGHT HOLDER> placeholder with your name.  In case you are a real person,
-then use the following format for <COPYRIGHT HOLDER>:
-
-<FIRST NAME> <MIDDLE NAMES> <LAST NAME>
-
-The <FIRST NAME> is your first name (also known as given name), the
-<MIDDLE NAMES> are your optional middle names, the <LAST NAME> is your last
-name (also known as family name).
-
-If more than one copyright holder exists for a file, then sort the copyright
-lines by the first year (earlier years are below later years) followed by the
-copyright holder in alphabetical order (A is above B).
-
-You must not alter anything else in the license comment.
-
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (C) <FIRST YEAR>, <LAST YEAR> <COPYRIGHT HOLDER>
- *
- * 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 OWNER 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.
- */

LICENSE.CC-BY-SA-4.0

@@ -1,428 +0,0 @@
-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:
-    wiki.creativecommons.org/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:
-    wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-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.
-
-     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.
-
-  c. 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.
-
-  d. 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.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. 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.
-

LICENSE.GPL-2.0

@@ -1,339 +0,0 @@
-                    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
-
-            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 a brief idea of what it does.>
-    Copyright (C) <year>  <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
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

LICENSE.JFFS2

@@ -1,30 +0,0 @@
-The files in this directory and elsewhere which refer to this LICENCE
-file are part of JFFS2, the Journalling Flash File System v2.
-
-	Copyright © 2001-2007 Red Hat, Inc. and others
-
-JFFS2 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 or (at your option) any later 
-version.
-
-JFFS2 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 JFFS2; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-As a special exception, if other files instantiate templates or use
-macros or inline functions from these files, or you compile these
-files and link them with other works to produce a work based on these
-files, these files do not by themselves cause the resulting work to be
-covered by the GNU General Public License. However the source code for
-these files must still be made available in accordance with section (3)
-of the GNU General Public License.
-
-This exception does not invalidate any other reasons why a work based on
-this file might be covered by the GNU General Public License.
-

LICENSE.NET

@@ -1,59 +0,0 @@
-The RTEMS TCP/IP stack is a port of the FreeBSD TCP/IP stack.  The following
-copyright and licensing information applies to this code.
-
-This code is found under the c/src/libnetworking directory but does not
-constitute the entire contents of that subdirectory.
-
-=============================================================================
-
-Copyright (c) 1980, 1983, 1988, 1993
-	The Regents of the University of California.  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. All advertising materials mentioning features or use of this software
-   must display the following acknowledgment:
-	This product includes software developed by the University of
-	California, Berkeley and its contributors.
-4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
-
--
-Portions Copyright (c) 1993 by Digital Equipment Corporation.
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies, and that
-the name of Digital Equipment Corporation not be used in advertising or
-publicity pertaining to distribution of the document or software without
-specific, written prior permission.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
-CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-=============================================================================

LICENSE.RPCXDR

@@ -1,40 +0,0 @@
-The RTEMS RPC/XDR support is a port of the freely distributed
-Sun Microsystems implementation.  The following copyright and
-licensing information applies to this code.
-
-This code is in the c/src/librpc directory.
-
-=============================================================================
-
-Copyright (C) 1984, Sun Microsystems, Inc.
-
-Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-unrestricted use provided that this legend is included on all tape
-media and as a part of the software program in whole or part.  Users
-may copy or modify Sun RPC without charge, but are not authorized
-to license or distribute it to anyone else except as part of a product or
-program developed by the user.
-
-SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-
-Sun RPC is provided with no support and without any obligation on the
-part of Sun Microsystems, Inc. to assist in its use, correction,
-modification or enhancement.
-
-SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-OR ANY PART THEREOF.
-
-In no event will Sun Microsystems, Inc. be liable for any lost revenue
-or profits or other special, indirect and consequential damages, even if
-Sun has been advised of the possibility of such damages.
-
-Sun Microsystems, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-=============================================================================
-
-

MAINTAINERS

@@ -1,65 +0,0 @@
-Maintainers
-===========
-This file contains information about people who are permitted to make
-changes to RTEMS and its associated components and add-ons.  Please do
-not contact the people in this file directly to report problems with RTEMS.
-
-For general information about RTEMS, please visit: http://www.rtems.org
-
-To report problems in RTEMS, please visit: http://www.rtems.org/bugs.html
-
-RTEMS is maintained by collection of volunteers.  RTEMS is a very
-broad and diverse project which requires expertise in many areas.
-This breadth of knowledge exceeds the capabilities of any
-single person. Each volunteer has areas of expertise where they
-are more comfortable but each is capable of making technical
-decisions across the entirety of RTEMS.
-
-Blanket Write Privileges are granted to experienced RTEMS developers
-who can be trusted to distinguish between changes which require
-others to review, require a problem report, or can be safely committed
-with limited review.
-
-Write After Approval is granted to experienced but also trusted
-RTEMS developers.  These developers may be less familiar with
-the breadth of RTEMS.  Developers with write after approval need
-to submit their patches for review.  Once the patches have been approved by a
-developer with Blanket Write Privileges, the patches may be checked in.
-A BSP-specific patch may be checked in three work days after sending it to
-devel@rtems.org in case nobody explicitly rejected the patch.
-
-Localized Write Permission is for developers who have primary
-responsibility for a port and all associated BSPs, a BSP, or other
-specific aspects of RTEMS.  These folks are allowed to make changes to
-areas they maintain and related documentation, web pages, and test cases
-without approval from anyone else, and approve other people's changes
-in those areas. They must get approval for changes elsewhere in RTEMS.
-
-Blanket Write Privileges
-========================
-Jennifer Averett           jennifer.averett@OARcorp.com
-Thomas Doefler             Thomas.Doerfler@embedded-brains.de
-Sebastian Huber            sebastian.huber@embedded-brains.de
-Chris Johns                chrisj@rtems.org
-Joel Sherrill              joel.sherrill@OARcorp.com
-Gedare Bloom               gedare@rtems.org
-
-Write After Approval
-====================
-Daniel Hellstrom           daniel@gaisler.com
-Ben Gras                   beng@rtems.org
-Pavel Pisa                 ppisa@pikron.com
-Christian Mauderer         christian.mauderer@embedded-brains.de
-Hesham Almatary            heshamelmatary@gmail.com
-Amaan Cheval               amaan@rtems.org
-Vijay Kumar Banerjee       vijay@rtems.org
-
-Localized Write Permission
-==========================
-sparc                      Daniel Hellstrom (daniel@gaisler.com)
-beagle                     Ben Gras (beng@rtems.org)
-tms570                     Pavel Pisa (pisa@cmp.felk.cvut.cz)
-raspberrypi                Pavel Pisa (pisa@cmp.felk.cvut.cz)
-x86_64                     Amaan Cheval (amaan@rtems.org)
-beagle                     Vijay Kumar Banerjee (vijay@rtems.org)
-

Makefile.am

@@ -1,55 +1,42 @@
 #
 # top level directory for RTEMS build tree
 #
+## The target's toplevel Makefile now is in c/src
+##
+## $Id$
+##
 
-ACLOCAL_AMFLAGS = -I aclocal
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS = $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
-DIST_SUBDIRS = $(SUBDIRS)
+SUBDIRS = doc make tools @TARGET_SUBDIRS@
+
+AUTOMAKE_FILES = automake/subdirs.am automake/local.am automake/lib.am
+
+ACLOCAL_FILES += aclocal/ar-s.m4 aclocal/bsp-alias.m4 \
+    aclocal/canonical-host.m4 aclocal/canonical-target-name.m4 \
+    aclocal/canonicalize-tools.m4 aclocal/check-bsps.m4 \
+    aclocal/check-bsp-cache.m4 aclocal/check-cpu.m4 aclocal/check-cxx.m4 \
+    aclocal/check-itron.m4 aclocal/check-multiprocessing.m4 \
+    aclocal/check-networking.m4 aclocal/check-newlib.m4 \
+    aclocal/check-posix.m4 aclocal/check-rdbg.m4 aclocal/enable-bare.m4 \
+    aclocal/enable-cxx.m4 aclocal/enable-gcc28.m4 aclocal/enable-hwapi.m4 \
+    aclocal/enable-inlines.m4 aclocal/enable-itron.m4 \
+    aclocal/enable-libcdir.m4 aclocal/enable-multiprocessing.m4 \
+    aclocal/enable-networking.m4 aclocal/enable-posix.m4 \
+    aclocal/enable-rdbg.m4 aclocal/enable-rtemsbsp.m4 \
+    aclocal/enable-tests.m4 aclocal/gcc-pipe.m4 aclocal/gcc-specs.m4 \
+    aclocal/i386-gas-code16.m4 aclocal/path-ksh.m4 aclocal/path-perl.m4 \
+    aclocal/prog-cc.m4 aclocal/prog-cxx.m4 aclocal/project-root.m4 \
+    aclocal/rtems-top.m4 aclocal/sysv-ipc.m4 aclocal/target.m4 \
+    aclocal/tool-paths.m4 aclocal/tool-prefix.m4
 
 noinst_SCRIPTS = bootstrap
 
+EXTRA_DIST = $(AUTOMAKE_FILES) $(ACLOCAL_FILES) README.configure SUPPORT \
+    VERSION LICENSE $(noinst_SCRIPTS)
 
-dist-hook:
-	@files=`(cd $(srcdir); find cpukit c testsuites \
-	   -name configure.ac -print | sed 's,/configure.ac,,' | sort)`; \
-	for i in $$files; do \
-	  if test -f $(distdir)/$$i/configure.ac; then : ; \
-	  else \
-	    d=`dirname $(distdir)/$$i`; \
-	    $(MKDIR_P) $$d;\
-	    echo "cp -pR $(srcdir)/$$i $(distdir)/$$i"; \
-	    cp -pR $(srcdir)/$$i $(distdir)/$$i; \
-	  fi; \
-	done
-	rm -rf `find $(distdir) -name 'autom4te*'`
-	rm -rf `find $(distdir) -name CVS`
-	rm -f `find $(distdir) \( -name .cvsignore \
-	  -o -name config.status \
-	  -o -name config.log \)`
-	rm -f `find $(distdir) \( -name '*.bak' \
-	  -o -name 'changes' -o -name 'diff' -o -name 'tmp' -o -name 'log' \
-	  -o -name '*~' -o -name '.*~' -o -name '.#*' \)`
-	find $(distdir) -name '*.in' -print | while read a; do \
-	  f=`echo $$a | sed 's,\.in$$,,'`; \
-	  if test -f $$f; then echo "rm $$f"; rm $$f; fi; done
-
-rtems_makedir = $(prefix)/make
-
-dist_rtems_make_DATA = 
-dist_rtems_make_DATA += make/main.cfg
-dist_rtems_make_DATA += make/leaf.cfg
-
-rtems_make_Templatesdir = $(pkgdatadir)/make/Templates
-
-dist_rtems_make_Templates_DATA =
-dist_rtems_make_Templates_DATA += make/Templates/Makefile.dir
-dist_rtems_make_Templates_DATA += make/Templates/Makefile.leaf
-dist_rtems_make_Templates_DATA += make/Templates/Makefile.lib
-
-rtems_make_customdir = $(rtems_makedir)/custom
-
-dist_rtems_make_custom_DATA = make/custom/default.cfg
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(ACLOCAL_FILES)
 
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/host.am

Makefile.maint

@@ -1,153 +0,0 @@
-#
-# Maintainer Makefile
-#
-
-# WARNING:
-
-# THIS IS EXPERIMENTAL - DO NOT USE (YET) !
-
-# * This Makefile is only useful to RTEMS maintainers
-# * You must have write access to RTEMS CVS
-# * Running this Makefile modifies RTEMS CVS
-# * Watch out for warning and error messages - Do NOT IGNORE them!
-
-
-# MAINTAINER notes:
-
-
-# Cutting a new release:
-# 1. Perform a non-anonymous cvs checkout of the BRANCH 
-#    you want to cut a release tarball from
-# 2. Run "make -f Makefile.maint new-revision"
-#    (rsp. "make -f Makefile.maint new-minor").
-# 3. Run "make -f Makefile.maint commit"
-# 4. Run "make -f Makefile.maint tag"
-# 5. Run "make -f Makefile.maint tarball"
-
-# -----------------
-# SECURITY: Append a string to tag to avoid accidentially screwing up cvs-tags
-# For "hot runs" you will want to use "make -f Makefile.maint TAG_SUFFIX= <command>"
-TAG_SUFFIX = -test1
-
-rtems_version := $(shell cat VERSION | sed -n '/.* Version /{s/^.*Version[ ]*\([0-9\.]\+\)/\1/p};')
-rtems_tag     := $(shell echo "rtems-$(rtems_version)" | tr . -)
-rtems_api     := 4.10
-PATH          := /opt/rtems-$(rtems_api)/bin:$(PATH)
-
-# -----------------
-# Cleanup check out and cvs-tag the files inside
-tag:
-	cvs -q -z9 up -dP
-	./bootstrap -p >/dev/null
-	cvs -q tag -c $(rtems_tag)$(TAG_SUFFIX)
-
-# -----------------
-# Different stages of cvs-exporting
-rtems-$(rtems_version)/stamp.export.$(rtems_tag)$(TAG_SUFFIX):
-	rm -rf rtems-$(rtems_version)
-	@cvs -q -z9 export -d rtems-$(rtems_version) -r $(rtems_tag)$(TAG_SUFFIX) rtems
-	@if ! test -f rtems-$(rtems_version)/VERSION; then \
-	echo "ERROR export failed"; \
-	echo " Did you run 'make -f Makefile.maint tag' ?"; exit 1; fi
-	echo "$(rtems_tag)$(TAG_SUFFIX)" > rtems-$(rtems_version)/stamp.export.$(rtems_tag)$(TAG_SUFFIX)
-
-rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2: rtems-$(rtems_version)/stamp.autofiles \
-	  rtems-$(rtems_version)/excludes \
-	  rtems-$(rtems_version)/TOOL_VERSIONS
-	tar -cj -X rtems-$(rtems_version)/excludes \
-	  -f rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2 rtems-$(rtems_version)
-
-## Touching the top pages in the various manuals results in the date
-## on their title page matching the release date.
-rtems-$(rtems_version)/stamp.cleanup: rtems-$(rtems_version)/stamp.export.$(rtems_tag)$(TAG_SUFFIX)
-	find rtems-$(rtems_version) -name .cvsignore -exec rm -f {} \;
-	find rtems-$(rtems_version) -name preinstall.am -exec touch {} \;
-	rm -rf rtems-$(rtems_version)/contrib
-	touch rtems-$(rtems_version)/stamp.cleanup
-
-rtems-$(rtems_version)/stamp.autofiles: rtems-$(rtems_version)/stamp.cleanup
-	cd rtems-$(rtems_version) && ./bootstrap -r
-	touch rtems-$(rtems_version)/stamp.autofiles
-
-rtems-$(rtems_version)/excludes: Makefile.maint
-	@echo "Generating $@"
-	@echo "excludes" > $@
-	@echo "stamp.*" >> $@
-	@echo "autom4te.cache" >> $@
-	@echo "Makefile.maint" >> $@
-
-tarball: rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2
-
-rtems-$(rtems_version)/TOOL_VERSIONS: Makefile.maint
-	( \
-	 date ; \
-	 echo ; \
-	 echo "This file contains configuration information on the " ; \
-	 echo "primary computer used to test and make the $(rtems_version)" ; \
-	 echo "version of RTEMS" ; \
-	 echo ; \
-	 echo "OS Version: " `head -1 /etc/issue` ; \
-	 echo ; \
-	 echo "The following RTEMS RPMs were installed on the machine" ; \
-	 echo "where this release was made:" ; \
-	 echo ; \
-	 rpm -qa 'rtems-$(rtems_api)-*' | sort | sed -e 's/^/    /' ; \
-	 echo \
-	 ) > $@
-
-# -----------------
-# Create a new minor release
-# increments the 2nd digit of the version number
-# set the 3rd digit of the version number to 0
-# Example: 4.6.99.4 -> 4.7.0
-new-minor:
-	@v=$$(echo $(rtems_version) | sed 's,^\([0-9]\+\).*,\1,'); \
-	r=$$(echo $(rtems_version) | sed 's,^[0-9]\+\.\([0-9]\+\).*,\1,'); \
-	r=$$(($$r + 1)); version="$$v.$$r.0"; \
-	echo "New minor release: $$version"; \
-	sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
-	  $(VERSION_FILES); \
-	sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
-
-# Create a new revision release
-# increments the last digit of the version number
-# Examples: 4.6.99.4 -> 4.6.99.5
-#           4.7.0 -> 4.7.1
-new-revision:
-	@m=$$(echo $(rtems_version) | sed 's,^\(.*\)\.[0-9]\+,\1,'); \
-	n=$$(echo $(rtems_version) | sed 's,^.*\.\([0-9]\+\),\1,'); \
-	n=$$(($$n + 1)); version="$$m.$$n";\
-	echo "New revision release: $$version"; \
-	sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
-	  $(VERSION_FILES); \
-	sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
-
-# -----------------
-# Create a new branch
-# increments the 2nd digit of the version number
-# set the 3rd digit of the version number to 99
-# set the 4rd digit of the version number to 0
-# Example: 4.6.34.4 -> 4.7.99.0
-new-branch:
-	v=$$(echo $(rtems_version) | sed 's,^\([0-9]\+\).*,\1,'); \
-	r=$$(echo $(rtems_version) | sed 's,^[0-9]\+\.\([0-9]\+\).*,\1,'); \
-	r=$$(($$r + 1)); version="$$v.$$r.99.0"; \
-	api="$$v.$$(($$r + 1))"; \
-	echo "New branch release: $$version"; \
-	sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
-	  -e "s|\[_RTEMS_API\],\[.*\]|\[_RTEMS_API\],\[$$api\]|" \
-	  $(VERSION_FILES); \
-	sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
-
-VERSION_FILES += aclocal/version.m4
-VERSION_FILES += cpukit/aclocal/version.m4
-VERSION_FILES += c/src/aclocal/version.m4
-VERSION_FILES += testsuites/aclocal/version.m4
-
-CVS_RUN := $(shell if [ -n "$(TAG_SUFFIX)" ]; then echo "cvs -n"; else echo "cvs"; fi)
-
-commit:
-	$(CVS_RUN) commit -m "Upgrade to $(rtems_version)" \
-	  $(VERSION_FILES) VERSION
-
-.PHONY: commit new-minor new-revision new-branch tag tarball

README

@@ -1,57 +1,97 @@
-Real-Time Executive for Multiprocessing Systems (RTEMS)
--------------------------------------------------------
+#
+#  $Id$
+#
 
-RTEMS, Real-Time Executive for Multiprocessor Systems, is a real-time executive
-(kernel) which provides a high performance environment for embedded
-applications with the following features:
+Building RTEMS
+==============
+See the file README.configure.
 
- - standards based user interfaces
- - multitasking capabilities
- - homogeneous and heterogeneous multiprocessor systems
- - event-driven, priority-based, preemptive scheduling
- - optional rate monotonic scheduling
- - intertask communication and synchronization
- - priority inheritance
- - responsive interrupt management
- - dynamic memory allocation
- - high level of user configurability
- - open source with a friendly user license
+Directory Overview
+==================
 
-Project git repositories are located at https://git.rtems.org/
+This is the top level of the RTEMS directory structure.  The following 
+is a description of the files and directories in this directory:
 
- RTEMS Kernel:        : https://git.rtems.org/rtems/
- RTEMS Source Builder : https://git.rtems.org/rtems-source-builder/
- RTEMS Tools          : https://git.rtems.org/rtems-tools/
- RTEMS Documentation  : https://git.rtems.org/rtems-docs/
- RTEMS FreeBSD        : https://git.rtems.org/rtems-libbsd/
+  INSTALL
+    Rudimentary installation instructions.  For more detailed
+    information please see the Release Notes.  The Postscript 
+    version of this manual can be found in the file
+    c_or_ada/doc/relnotes.tgz.
 
-Online documentation is available at https://docs.rtems.org/
+  LICENSE
+    Required legalese.
 
- RTEMS User Manual : https://docs.rtems.org/branches/master/user/index.html
- RTEMS RSB Manual  : https://docs.rtems.org/branches/master/rsb/index.html
- RTEMS Classic API : https://docs.rtems.org/branches/master/c-user/index.html
- RTEMS POSIX API   : https://docs.rtems.org/branches/master/posix-users/index.html
+  README
+    This file.
 
-RTEMS Doxygen for CPUKit : https://docs.rtems.org/doxygen/branches/master/
+  c
+    This directory contains the source code for the C 
+    implementation of RTEMS as well as the test suites, sample 
+    applications, Board Support Packages, Device Drivers, and 
+    support libraries.
 
-RTEMS POSIX 1003.1 Compliance Guide :
- https://docs.rtems.org/branches/master/posix-compliance/index.html
+  doc
+    This directory contains the PDL for the RTEMS executive.
 
- - Details the standards base functionality and profiles RTEMS supportsXo
+Ada versus C
+============
 
-RTEMS Developers Wiki : http://devel.rtems.org
+There are two implementations of RTEMS in this source tree -- 
+in Ada and in C.  These two implementations are functionally
+and structurally equivalent.  The C implementation follows
+the packaging conventions and hiearchical nature of the Ada 
+implementation.  In addition, a style has been followed which 
+allows one to easily find the corresponding Ada and C 
+implementations.  
 
- - Bug reporting, community knowledge and tutorials.
+File names in C and code placement was carefully designed to insure
+a close mapping to the Ada implementation.  The following file name 
+extensions are used:
 
-RTEMS Mailing Lists : https://lists.rtems.org/mailman/listinfo
+   .adb - Ada body
+   .ads - Ada specification
+   .adp - Ada body requiring preprocessing
+   .inc - include file for .adp files
 
- - The RTEMS Project maintains mailing lists which are used for most
-   discussions:
+   .c   - C body (non-inlined routines)
+   .inl - C body (inlined routines)
+   .h   - C specification
 
-   * For general-purpose questions related to using RTEMS, use the rtems-users
-     ml: https://lists.rtems.org/mailman/listinfo/users
+In the executive source, XYZ.c and XYZ.inl correspond directly to a 
+single XYZ.adb or XYZ.adp file.  A .h file corresponds directly to
+the .ads file.  There are only a handful of .inc files in the 
+Ada source and these are used to insure that the desired simple 
+inline textual expansion is performed.  This avoids scoping and
+calling convention side-effects in carefully constructed tests 
+which usually test context switch behavior.
 
-   * For questions and discussion related to development of RTEMS, use the
-     rtems-devel ml: https://lists.rtems.org/mailman/listinfo/devel
+In addition, in Ada code and data name references are always fully
+qualified as PACKAGE.NAME.  In C, this convention is followed 
+by having the package name as part of the name itself and using a
+capital letter to indicate the presence of a "." level.  So we have
+PACKAGE.NAME in Ada and _Package_Name in C.  The leading "_" in C
+is used to avoid naming conflicts between RTEMS and user variables.
+By using these conventions, one can easily compare the C and Ada
+implementations.
 
-The version number for this software is indicated in the VERSION file.
+The most noticeable difference between the C and Ada83 code is 
+the inability to easily obtain a "typed pointer" in Ada83.  
+Using the "&" operator in C yields a pointer with a specific type.
+The 'Address attribute is the closest feature in Ada83.  This
+returns a System.Address and this must be coerced via Unchecked_Conversion
+into an access type of the desired type.  It is easy to view 
+System.Address as similar to a "void *" in C, but this is not the case.
+A "void *" can be assigned to any other pointer type without an
+explicit conversion.  
+
+The solution adopted to this problem was to provide two routines for
+each access type in the Ada implementation -- one to convert from
+System.Address to the access type and another to go the opposite
+direction.  This results in code which accomplishes the same thing
+as the corresponding C but it is easier to get lost in the clutter
+of the apparent subprogram invocations than the "less bulky"
+C equivalent.
+
+A related difference is the types which are only in Ada which are used 
+for pointers to arrays.  These types do not exist and are not needed 
+in the C implementation.

README.configure

@@ -0,0 +1,250 @@
+#
+#  $Id$
+#
+
+1. Autoconf support
+===================
+
+This version of RTEMS is configured with GNU autoconf. RTEMS can be
+configured and built either standalone or together with the compiler
+tools in the Cygnus one-tree structure. Using autoconf also means
+that RTEMS now can be built in a separate build directory.
+
+2. Installation
+===============
+
+2.1 Standalone build
+
+To configure RTEMS for a specific target, run configure in the build
+directory. In addition to the standard configure options, the following
+RTEMS-specific option are supported:
+
+	--disable-rtems-inlines
+	--disable-posix
+	--disable-itron
+	--disable-networking
+        --enable-cxx
+        --enable-bare-cpu-model=<MODEL>
+        --enable-bare-cpu-cflags=<FLAGS>
+        --enable-gcc28               (also use enable-libcdir when disabled)
+        --enable-libcdir=<DIRECTORY>      (do not use if gcc 2.8 is enabled)
+        --enable-multiprocessing
+	--enable-rtemsbsp="bsp1 bsp2 ..."
+	--enable-tests
+	--enable-rdbg            (only valid for i386 and some PowerPC BSPs)
+
+In addition, the following standard autoconf options are frequently
+used when configuring RTEMS installations:
+
+        --prefix=INSTALL_DIRECTORY
+        --program-prefix=
+
+By default, inline routines are used instead of macros where possible.
+Macros can be selected using the --disable-inlines option.  [NOTE:
+Some APIs may not support macro versions of their inline routines.]
+
+By default, the RTEMS POSIX 1003.1b interface is built for targets that support
+it. It can be disabled with the --disable-posix option.
+
+By default, the RTEMS uITRON interface is built for targets that support
+it. It can be disabled with the --disable-itron option.
+
+By default, the RTEMS networking support is built for targets which
+support it.  It can be specifically disabled for those targets
+with the --disable-networking option.
+
+By default, the RTEMS remote debugger server support is not built.
+It can be specifically enabled for the targets that support it.
+with the --enable-rdbg option. NB : the RTEMS networking support
+must be enabled to support the remote debugger server.
+
+By default, the RTEMS support of C++ is disabled.  It can be enabled
+with the --enable-cxx option. If the rtems++ C++ library is installed
+it will also be build.
+
+By default, the RTEMS test suites are NOT configured -- only the 
+sample tests are built.  The --enable-tests will not configure
+the RTEMS test suite. The default speeds up the build
+and configure process when the tests are not desired.
+
+By default, RTEMS is built using arguments and build rules which are 
+NOT compatible with gcc 2.7.2.2.  If using a gcc which supports the
+-specs option, then the --enable-gcc28 option may be used to enable
+this feature.  You should use the --enable-gcc28 option when using
+either the egcs source tree, testgcc snapshots, or gcc 2.8.0 or newer.
+If you --disable-gcc28, then you MUST  specify the location of the
+Standard C Library with the --enable-libcdir option.   [NOTE: These
+options are considered obsolete and may be removed in a future
+RTEMS release.]
+
+By default, multiprocessing is is not built.  It can be enabled
+for those BSPs supporting it by the --enable-multiprocessing option.
+
+By default, all bsps for a target are built. The bare BSP is not built
+unless directlty specified. There are  two ways of changing this:
+
+  + use the --enable-rtemsbsp otion which will set the specified
+    bsps as the default bsps, or 
+  + set the RTEMS_BSP variable during make (see below).
+
+The --enable-rtemsbsp= option configures RTEMS for a specific target
+architecture.  The following targets are supported:
+
+	(none)			will build the host-based version on Linux,
+				Solaris and HPUX.
+
+	a29k-rtems		only standalone, uses non-gnu compiler
+	i386-rtems
+	i960-rtems
+	hppa1.1-rtems
+	m68k-rtems
+	mips64orion-rtems
+        no_cpu-rtems
+	powerpc-rtems
+	sparc-rtems
+        bare                    see notes
+	
+The cross-compiler is set to $(target)-gcc by default. This can be
+overriden by:
+
+  + using the --program-prefix option to configure to specify the
+    string which will prepended to the tool names.  Be sure to include
+    a trailing "-".  For example, to use a m68k-coff toolset, use the
+    --program-prefix=m68k-coff- option.
+
+To build, run make in the build directory. To specify which bsps to build,
+add the RTEMS_BSP="bsp1 bsp2 .." to the make command.  Specifying multiple
+BSPs to build only works from the top level build directory.
+
+Installation is done under $(prefix)/rtems.
+
+As an example, to build and install the mvme136 and dmv152 bsps for m68k do:
+
+	(path_to_rtems_src)/configure --target=m68k-rtems
+
+	make RTEMS_BSP="mvme136 dmv152"
+	
+	make install RTEMS_BSP="mvme136 dmv152"
+
+The sample tests are built by 'make all', do a 'make test' to build the full
+test suite.
+
+2.2 Build with Cygnus one-tree release
+
+To build and install RTEMS with the one-tree structure, just copy the rtems
+directory to the tree. The one-tree configure.in and Makefile.in has to be 
+replaced with the RTEMS-aware versions. The build options are the same as 
+for the standalone build.
+
+2.3 Target Dependent Notes
+
+bare:
+
+  1.  See the README in the bare bsp source directory. This should
+      contain all info you need.
+  2.  The bare bsp source contains a script to show how to build it.
+  3.  The configure flags must be used to get the bare bsp to work.
+      The --enable-bare-cpu-model and --enable-bare-cpu-cflags are the
+      only pieces of information. The module is usually a gcc module
+      such as m68302 or mcpu32. The flags are passed directly to gcc.
+      Use "" if more than one option is specified.
+
+3. To use the installed RTEMS library
+=====================================
+
+To use the installed RTEMS bsps to build applications, the application
+makefile has to include a bsp-specific makefile that will define the
+RTEMS variables necessary to find include files and libraries. The
+bsp-specific makefile is installed at 
+
+	$(RTEMS_MAKEFILE_PATH)/Makefile.inc
+
+For the erc32 bsp installed at /usr/local/cross, the environment
+variable RTEMS_MAKEFILE_PATH would be set as follows to the
+following:
+
+/usr/local/cross/sparc-rtems/rtems/erc32/Makefile.inc
+
+4. Supported target bsps
+========================
+
+The following bsps are supported:
+
+host-based	: posix (on linux, solaris and hpux)
+
+a29k		: portsw
+i386		: i386ex pc386
+i960		: cvme961
+hppa1.1		: simhppa
+m68k		: dmv152 efi332 efi68k gen68302 gen68340 gen68360 
+                  gen68360_040 idp mvme136 mvme147 mvme147s mvme162 ods68302
+no_cpu          : no_bsp
+mips64orion 	: p4600 p4650 (p4000 port with either R4600 or R4650)
+powerpc		: papyrus psim helas403
+sh              : gensh1
+sparc 		: erc32
+any             : bare
+
+5. Makefile structure
+=====================
+
+The makefiles have been re-organised. Most gnu-based bsps now use three
+main makefiles:
+    + custom/default.cfg,
+    + custom/bsp.cfg and
+    + ompilers/gcc-target-default.cfg.
+
+Default.cfg sets the deafult values of certain common build options.
+
+Bsp.cfg set bsp-specific build options and can also override the
+default settings.
+
+Gcc-target-default.cfg contains the common gcc definitions. Some targets
+(a29k, no_cpu, and posix) still use the old structure.
+
+6. Adding a bsp
+===============
+
+The top-level configure.in has to be modified if a new target is added
+or if a new bsp is to be built by default. The additions required is
+basically to add which makefiles are to be created by configure and
+to add the target to the selection statement. To re-generate
+configure, autoconf-2.12 is needed.
+
+7. Tested configurations
+========================
+
+All gnu-based bsps have been built on Linux. 
+The native (posix) ports have been built and run only on Linux.
+
+The following configurations have NOT been tested:
+
+    + Anything on Nextstep, HPUX and Irix.
+    + The a29k port.
+
+8. Pre-requisites
+=================
+
+Gawk version 2 or higher.
+GNU make version 3.72 or higher.
+Bash.
+gcc version ???
+
+TODO
+====
+
+The install-if-change script requires bash. On solaris systems, this should
+be changed to ksh, since ksh is provided with solaris (bash not).
+
+A fairly rescent version of gawk is needed to build RTEMS. This should be
+changed so that a plain vanilla awk also works. [NOTE: This dependency
+should disappear when the "gcc 2.8 -specs" is finished.]
+
+'make install' should only install necessary files, not the full
+PROJECT_RELEASE directory as now.
+
+Posix port on solaris-2.5 fails due to undefined built-in functions
+(gcc-2.7.2, might be my installation).
+
+Improve support for 'make CFLAGS=xxx'. 
+

SUPPORT

@@ -0,0 +1,22 @@
+#
+#  $Id$
+#
+
+On-Line Applications Research Corporation (OAR) offers support,
+customization, and training for RTEMS.  Custom RTEMS development services
+includes porting RTEMS to new processors and the development of custom board
+support packages and device drivers.   In addition, OAR is available
+to assist in the development of your real-time embedded application.
+
+For more information, email Mark Johannes at mark@OARcorp.com 
+or contact OAR at:
+
+On-Line Applications Research Corporation
+4910-L Corporate Drive
+Huntsville AL 35805
+Voice: (205) 722-9985
+Fax:   (205 722-0985
+
+RTEMS maintenance and development is funded solely by RTEMS users.  
+The future of RTEMS depends on its user base.
+

VERSION

@@ -0,0 +1,7 @@
+#
+#  This file is automatically generated -- DO NOT EDIT!!!
+#
+#  $Id$
+#
+
+RTEMS Version 4.5.1-pre1

acinclude.m4

@@ -1,399 +0,0 @@
-## All directories belong in one of 3 categories.
-## ${HOST_CONFIGDIRS_LIST} is directories we build using the host tools.
-## ${TARGET_CONFIGDIRS_LIST} is directories we build using the target tools.
-## ${BUILD_CONFIGDIRS_LIST} is directories we build using the build tools
-
-AC_PREREQ(2.60)
-
-dnl RTEMS_ARG_VAR(VAR,HELP-STRING)
-dnl An internal macros to have help strings pretty
-dnl printed with configure --help, without letting autoconf spoil config subdir
-dnl environments by trying to propagate them
-dnl Stripped down version of autoconf-2.52's AC_ARG_VAR.
-
-AC_DEFUN([_RTEMS_ARG_VAR],
-[
-m4_expand_once([m4_divert_once([HELP_VAR],
-[AS_HELP_STRING([$1], [$2], [              ])])],
-      [$0($1)])dnl
-])
-
-AC_DEFUN([_RTEMS_SUBST_IFNOT],
-[AS_IF([`echo " [$]$1 " | grep " $2 " > /dev/null`],
-  [],
-  [AC_SUBST([$1],["[$]$1 $2"])])
-])
-
-AC_DEFUN([_RTEMS_TOOLS],
-[
-m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
-[
-_RTEMS_ARG_VAR([CC_FOR_$2],
-  [c-compiler to be used for $1 subdirs (default: auto-detected)])
-_RTEMS_ARG_VAR([CFLAGS_FOR_$2],
-  [c-flags to be used for $1 subdirs (default: provided by autoconf)])
-_RTEMS_ARG_VAR([CXX_FOR_$2],
-  [c++-compiler to be used for $1 subdirs (default: auto-detected)])
-_RTEMS_ARG_VAR([CXXFLAGS_FOR_$2],
-  [c++-flags to be used for $1 subdirs (default: provided by autoconf)])
-])
-])
-
-AC_DEFUN([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS],
-[
-AC_CONFIG_COMMANDS_PRE([
-
-if test -z "${build_alias}"; then
-# build_alias is empty
-  if test -z "${host_alias}"; then
-  # host_alias is empty
-    if test -z "${target_alias}"; then
-    : target_alias is empty
-    else
-    : target_alias is not empty
-    fi
-  else
-  # host_alias is not empty
-    if test -z "${target_alias}"; then
-    : target_alias is empty
-    target_alias="${host_alias}"
-    else
-    : target_alias is not empty
-    fi
-  fi
-else
-# build_alias is not empty
-  if test -z "${host_alias}"; then
-  # host_alias is empty
-    if test -z "${target_alias}"; then
-    : target_alias is empty
-    else
-    : target_alias is not empty
-    fi
-  else
-  # host_alias is not empty
-    if test -z "${target_alias}"; then
-    : target_alias is empty
-    target_alias="${host_alias}"
-    else
-    : target_alias is not empty
-    fi
-  fi
-fi
-
-_RTEMS_BUILD_CONFIG_PREPARE
-_RTEMS_HOST_CONFIG_PREPARE
-_RTEMS_TARGET_CONFIG_PREPARE
-
-build_subdir="."
-build_SUBDIRS="${build_configdirs}"
-build_configdirs="${build_configdirs}"
-
-AS_IF([test $build != $host],
-[dnl
-  host_subdir="${host_alias-$host}"
-  host_SUBDIRS=`echo "${host_configdirs}" | \
-        sed -e "s%\([[^ ]][[^ ]]*\)%$host_subdir/\1%g"`
-  host_configdirs="${host_configdirs}"
-],[dnl
-  host_SUBDIRS="${host_configdirs}"
-  host_configdirs="${host_configdirs}"
-])
-
-AS_IF([test $build != $target],
-[dnl
-  target_subdir="${target_alias-$target}"
-  target_SUBDIRS=`echo "${target_configdirs}" | \
-      sed -e "s%\([[^ ]][[^ ]]*\)%$target_subdir/\1%g"`
-  target_configdirs="${target_configdirs}"
-],[dnl
-  target_SUBDIRS="${target_configdirs}"
-  target_configdirs="${target_configdirs}"
-])
-
-AC_SUBST(host_SUBDIRS)
-AC_SUBST(target_SUBDIRS)
-AC_SUBST(build_SUBDIRS)
-])
-
-  AC_CONFIG_COMMANDS_POST([
-    _RTEMS_OUTPUT_SUBDIRS([build],[BUILD])
-    _RTEMS_OUTPUT_SUBDIRS([host],[HOST])
-    _RTEMS_OUTPUT_SUBDIRS([target],[TARGET])
-  ])
-])
-
-dnl _RTEMS_SRCPATHS(BUILD-DIR-NAME)
-dnl ----------------------------
-dnl Inputs:
-dnl   - BUILD-DIR-NAME is `top-build -> build' and `top-src -> src'
-dnl   - `$srcdir' is `top-build -> top-src'
-dnl
-dnl Outputs:
-dnl - `ac_builddir' is `.', for symmetry only.
-dnl - `ac_top_builddir' is `build -> top_build'.
-dnl      If not empty, has a trailing slash.
-dnl - `ac_srcdir' is `build -> src'.
-dnl - `ac_top_srcdir' is `build -> top-src'.
-dnl
-dnl and `ac_buildpath' etc., the absolute paths.
-m4_define([_RTEMS_SRCPATHS],
-[
-m4_if([$2],,
-[dstdir=$1],
-[case "$2" in
-"." | "" ) 	# No subdir was given
-  dstdir=$1;;
-* ) 		# A subdir was given
-  dstdir=$2/$1;;
-esac])
-ac_builddir=.
-
-AS_IF([test $dstdir != .],
-[ # Strip off leading ./
-  ac_builddir_suffix=/`echo $dstdir | sed 's,^\.[[\\/]],,'`
-  ac_srcdir_suffix=/`echo $1 | sed 's,^\.[[\\/]],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_builddir_suffix" | sed 's,/[[^\\/]]*,../,g'`
-],[
-  ac_dir_suffix= ac_top_builddir=
-])
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [[\\/]]* | ?:[[\\/]]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_srcdir_suffix;
-    ac_top_srcdir=$srcdir;
-    ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_srcdir_suffix;
-    ac_top_srcdir=$ac_top_builddir$srcdir;
-    ;;
-esac
-dnl Don't blindly perform a `cd $1/$ac_foo && pwd` since $ac_foo can be
-dnl absolute.
-
-ac_buildpath=`cd $dstdir && cd $ac_builddir && pwd`
-ac_top_buildpath=`cd $dstdir && cd $ac_top_builddir && pwd`
-ac_srcpath=`cd $dstdir && cd $ac_srcdir && pwd`
-ac_top_srcpath=`cd $dstdir && cd $ac_top_srcdir && pwd`
-])# _AC_SRCPATHS
-
-dnl _RTEMS_OUTPUT_SUBDIRS([host|target|build],[HOST|TARGET|BUILD])
-AC_DEFUN([_RTEMS_OUTPUT_SUBDIRS],[
-m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
-[
-if test "$no_recursion" != yes; then
-
- if test -n "${$1_SUBDIRS}"; then
-   ac_sub_configure_args="[$]$1args"
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_sub_configure_args="'--prefix=$prefix' $ac_sub_configure_args"
-
-  # make sure that $1_subdir is not empty
-  test -n "$$1_subdir" || $1_subdir="."
-
-  case "$$1_subdir" in
-  "." ) ;;
-  * )
-    ac_sub_configure_args="$ac_sub_configure_args '--with-target-subdir=$$1_subdir'"
-    ac_sub_configure_args="$ac_sub_configure_args '--exec-prefix=${prefix}/$$1_subdir'"
-    ac_sub_configure_args="$ac_sub_configure_args '--includedir=${prefix}/$$1_subdir/include'"
-    ;;
-  esac
-
-  ac_popdir=`pwd`
-  for ac_dir in : $$1_configdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d $srcdir/$ac_dir || continue
-
-    AC_MSG_NOTICE([configuring in $$1_subdir/$ac_dir])
-    AS_MKDIR_P(["$$1_subdir/$ac_dir"])
-    _RTEMS_SRCPATHS(["$ac_dir"],["$$1_subdir"])
-
-    cd $$1_subdir/$ac_dir
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-    elif test -f $ac_srcdir/configure; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-    elif test -f $ac_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      AC_MSG_WARN([no configuration information is in $ac_dir])
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [[\\/]]* | ?:[[\\/]]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file=$ac_top_builddir$cache_file ;;
-      esac
-
-      ac_sub_configure_vars=
-      ac_sub_configure_vars="$ac_sub_configure_vars '--cache-file=$ac_sub_cache_file'"
-      ac_sub_configure_vars="$ac_sub_configure_vars '--srcdir=$ac_srcdir'"
-
-      test -n "[$]CC_FOR_$2" && \
-	ac_sub_configure_vars="$ac_sub_configure_vars 'CC=[$]CC_FOR_$2'"
-      test -n "[$]CXX_FOR_$2" && \
-        ac_sub_configure_vars="$ac_sub_configure_vars 'CXX=[$]CXX_FOR_$2'"
-      test -n "[$]CFLAGS_FOR_$2" && \
-        ac_sub_configure_vars="$ac_sub_configure_vars 'CFLAGS=[$]CFLAGS_FOR_$2'"
-      test -n "[$]CXXFLAGS_FOR_$2" && \
-        ac_sub_configure_vars="$ac_sub_configure_vars 'CXXFLAGS=[$]CXXFLAGS_FOR_$2'"
-
-      # The eval makes quoting arguments work.
-      AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args $ac_sub_configure_vars])
-      eval $ac_sub_configure $ac_sub_configure_args $ac_sub_configure_vars ||
-        AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir])
-    fi
-
-    cd "$ac_popdir"
-  done
- fi
-fi
-])
-])
-
-AC_DEFUN([_RTEMS_CONFIGURE_ARGS_PRUNE],
-[
-$1_prune()
-{
-  $1=
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-
-    -host* | --host* );;
-    -host | --host ) 
-      ac_prev=host_alias;;
-    -target* | --target* );;
-    -target | --target )
-      ac_prev=target_alias;;
-    -build* | --build* );;
-    -build | --build ) 
-      ac_prev=build_alias;;
-
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-
-    *_alias=* );;
-
-    m4_if([$2],,,[$2])
-    *) $1="$$1 '$ac_arg'" ;;
-   esac
-  done
-  export $1
-}
-])
-
-## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir)
-# subdirs to be built for the build environment
-AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[
-m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1])
-dnl Always append to build_configdirs
-AC_SUBST(build_configdirs,"$build_configdirs $1")
-
-m4_divert_text([DEFAULTS],
-               [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
-m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
-])
-
-AC_DEFUN([_RTEMS_BUILD_CONFIG_PREPARE],[
-## # Record the configure arguments in Makefile.
-m4_ifdef([_RTEMS_BUILD_CONFIGDIRS_LIST],
-[
-m4_expand_once([_RTEMS_TOOLS([build],[BUILD])])
-m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([buildargs])])
-eval buildargs_prune $ac_configure_args
-buildargs="'--host=${build_alias-$build}' '--build=${build_alias-$build}' ${buildargs}"
-buildargs="${buildargs} '--target=${target_alias-$target}'"
-],[])
-AC_SUBST(buildargs)
-AC_SUBST(build_subdir)
-])
-
-## PUBLIC: RTEMS_HOST_CONFIG_SUBDIRS(host_subdir)
-# subdirs to be build for the host environment
-AC_DEFUN([RTEMS_HOST_CONFIG_SUBDIRS],[
-m4_append([_RTEMS_HOST_CONFIGDIRS_LIST],[ $1])dnl
-
-_RTEMS_SUBST_IFNOT([host_configdirs],[$1])
-
-m4_divert_text([DEFAULTS],
-               [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
-m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
-])
-
-AC_DEFUN([_RTEMS_HOST_CONFIG_PREPARE],[
-m4_ifdef([_RTEMS_HOST_CONFIGDIRS_LIST],
-[
-m4_expand_once([_RTEMS_TOOLS([host],[HOST])])
-m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([hostargs])])
-eval hostargs_prune $ac_configure_args
-hostargs="'--host=${host_alias-$host}' '--build=${build_alias-$build}' '--target=${target_alias-$target}' ${hostargs}"
-],[])
-AC_SUBST(hostargs)
-AC_SUBST(host_subdir)
-])
-
-## PUBLIC: RTEMS_TARGET_CONFIG_SUBDIRS(target_subdir)
-# subdirs to be build for the target environment
-AC_DEFUN([RTEMS_TARGET_CONFIG_SUBDIRS],[
-AS_IF([test -d ${srcdir}/$1],[
-m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1])
-
-_RTEMS_SUBST_IFNOT([target_configdirs],[$1])
-
-m4_divert_text([DEFAULTS],
-               [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
-m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
-  ])
-])
-
-AC_DEFUN([_RTEMS_TARGET_CONFIG_PREPARE],[
-m4_ifdef([_RTEMS_TARGET_CONFIGDIRS_LIST],
-[
-m4_expand_once([_RTEMS_TOOLS([target],[TARGET])])
-m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([targetargs])])
-eval targetargs_prune $ac_configure_args
-targetargs="'--host=${target_alias-$target}' '--build=${build_alias-$build}' '--target=${target_alias-$target}' ${targetargs}"
-],[])
-AC_SUBST(targetargs)
-AC_SUBST(target_subdir)
-])

aclocal/ar-s.m4

@@ -0,0 +1,25 @@
+dnl
+dnl $Id$
+dnl
+
+AC_DEFUN(RTEMS_AR_FOR_TARGET_S,
+[
+AC_CACHE_CHECK(whether $AR_FOR_TARGET -s works,
+rtems_cv_AR_FOR_TARGET_S,
+[
+cat > conftest.$ac_ext <<EOF
+int foo( int b ) 
+{ return b; }
+EOF
+if AC_TRY_COMMAND($CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext) \
+  && AC_TRY_COMMAND($AR_FOR_TARGET -sr conftest.a conftest.o) \
+  && test -s conftest.a ; \
+then
+  rtems_cv_AR_FOR_TARGET_S="yes"
+else
+  rtems_cv_AR_FOR_TARGET_S="no"
+fi
+  rm -f conftest*
+])
+])
+

aclocal/bsp-alias.m4

@@ -1,20 +1,22 @@
-dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
-dnl Internal subroutine to RTEMS_BSP_ALIAS
-AC_DEFUN([_RTEMS_BSP_ALIAS],[
-AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
-AC_REQUIRE([RTEMS_SOURCE_TOP])
-# account for "aliased" bsps which share source code
-      for bsp_cfgs in `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/"config/$1.cfg" 2>/dev/null`; do
-        $2=`echo "$bsp_cfgs" | sed \
-          -e "s,^${RTEMS_SOURCE_ROOT}/bsps/$RTEMS_CPU/,," \
-          -e "s,/config/.*\.cfg$,,"`
-        break
-      done
-])
+dnl
+dnl  $Id$
+dnl 
 
-dnl RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
-dnl convert a bsp alias $1 into its bsp directory RTEMS_BSP_FAMILY
-AC_DEFUN([RTEMS_BSP_ALIAS],
-[_RTEMS_BSP_ALIAS(m4_if([$1],,[$RTEMS_BSP],[$1]),
-  m4_if([$2],,[RTEMS_BSP_FAMILY],[$2]))]
-)
+dnl RTEMS_BSP_ALIAS(BSP_ALIAS,BSP_RETURNED)
+dnl convert a bsp alias $1 into its bsp directory $2
+AC_DEFUN(RTEMS_BSP_ALIAS,
+[
+  # account for "aliased" bsps which share source code
+  case $1 in
+    mcp750)       $2=motorola_powerpc ;; # Motorola PPC board variant
+    mvme2307)     $2=motorola_powerpc ;; # Motorola PPC board variant
+    mvme162lx)    $2=mvme162          ;; # m68k - mvme162 board variant
+    gen68360_040) $2=gen68360         ;; # m68k - 68360 in companion mode
+    p4600)        $2=p4000            ;; # mips64orion - p4000 board w/IDT 4600
+    p4650)        $2=p4000            ;; # mips64orion - p4000 board w/IDT 4650
+    pc486)        $2=pc386            ;; # i386 - PC with i486DX
+    pc586)        $2=pc386            ;; # i386 - PC with Pentium
+    pc686)        $2=pc386            ;; # i386 - PC with PentiumPro
+    *)            $2=$1;;
+  esac
+])

aclocal/canonical-host.m4

@@ -0,0 +1,27 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_CANONICAL_HOST,
+[dnl
+AC_REQUIRE([AC_CANONICAL_HOST])
+RTEMS_HOST=$host_os
+changequote(,)dnl
+case "${target}" in
+  # hpux unix port should go here
+  i[34567]86-*linux*)          # unix "simulator" port
+        RTEMS_HOST=Linux
+	;;
+  i[34567]86-*freebsd*)         # unix "simulator" port
+        RTEMS_HOST=FreeBSD
+	;;
+  i[34567]86-pc-cygwin*) 	# Cygwin is just enough unix like :)
+        RTEMS_HOST=Cygwin
+	;;
+  sparc-sun-solaris*)           # unix "simulator" port
+        RTEMS_HOST=Solaris
+	;;
+  *) 
+	;;
+esac
+changequote([,])dnl
+AC_SUBST(RTEMS_HOST)
+])dnl

aclocal/canonical-target-name.m4

@@ -1,24 +1,40 @@
+dnl
+dnl $Id$
+dnl
+
 dnl canonicalize target cpu
-dnl NOTE: Most rtems targets do not fulfil autoconf's
+dnl NOTE: Most rtems targets do not fullfil autoconf's
 dnl target naming conventions "processor-vendor-os"
 dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
 dnl and we have to fix it for rtems ourselves 
 
-AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
+AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
 [
-AC_CANONICAL_TARGET
+AC_CANONICAL_SYSTEM
 AC_MSG_CHECKING(rtems target cpu)
+changequote(,)dnl
 case "${target}" in
+  # hpux unix port should go here
+  i[34567]86-*linux*)		# unix "simulator" port
+	RTEMS_CPU=unix
+	;;
+  i[34567]86-*freebsd*) 	# unix "simulator" port
+	RTEMS_CPU=unix
+	;;
+  i[34567]86-pc-cygwin*) 	# Cygwin is just enough unix like :)
+	RTEMS_CPU=unix
+	;;
   no_cpu-*rtems*)
         RTEMS_CPU=no_cpu
 	;;
-  riscv*-*rtems*)
-        RTEMS_CPU=riscv
+  sparc-sun-solaris*)           # unix "simulator" port
+	RTEMS_CPU=unix
 	;;
-  *)
-	RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
+  *) 
+	RTEMS_CPU=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
 	;;
 esac
+changequote([,])dnl
 AC_SUBST(RTEMS_CPU)
 AC_MSG_RESULT($RTEMS_CPU)
 ])

aclocal/canonicalize-tools.m4

@@ -0,0 +1,89 @@
+dnl
+dnl $Id$
+dnl
+dnl Set target tools
+dnl
+dnl 98/06/23 Ralf Corsepius	(corsepiu@faw.uni-ulm.de)
+dnl		fixing cache/environment variable handling
+dnl		adding checks for cygwin/egcs '\\'-bug
+dnl		adding checks for ranlib/ar -s problem 
+dnl
+dnl 98/02/12 Ralf Corsepius	(corsepiu@faw.uni-ulm.de)
+dnl
+
+AC_DEFUN(RTEMS_GCC_PRINT,
+[
+    $1=`$CC_FOR_TARGET --print-prog-name=$2`
+])
+
+AC_DEFUN(RTEMS_PATH_TOOL,
+[
+AC_MSG_CHECKING([target's $2])
+AC_CACHE_VAL(ac_cv_path_$1,:)
+AC_MSG_RESULT([$ac_cv_path_$1])
+
+if test -n "$ac_cv_path_$1"; then
+  dnl retrieve the value from the cache
+  $1=$ac_cv_path_$1
+else
+  dnl the cache was not set
+  if test -z "[$]$1" ; then
+    if test "$rtems_cv_prog_gcc" = "yes"; then
+      # We are using gcc, ask it about its tool
+      # NOTE: Necessary if gcc was configured to use the target's 
+      # native tools or uses prefixes for gnutools (e.g. gas instead of as)
+      RTEMS_GCC_PRINT($1,$2)
+    fi
+  else
+    # The user set an environment variable.
+    # Check whether it is an absolute path, otherwise AC_PATH_PROG 
+    # will override the environment variable, which isn't what the user
+    # intends
+    AC_MSG_CHECKING([whether environment variable $1 is an absolute path])
+    case "[$]$1" in
+    /*) # valid
+      AC_MSG_RESULT("yes")
+    ;;
+    *)  # invalid for AC_PATH_PROG
+      AC_MSG_RESULT("no")
+      AC_MSG_ERROR([***]
+        [Environment variable $1 should either]
+	[be unset (preferred) or contain an absolute path])
+    ;;
+    esac
+  fi
+
+  AC_PATH_PROG($1,"$program_prefix"$2,$3)
+fi
+])
+
+AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
+[AC_REQUIRE([RTEMS_PROG_CC])dnl
+
+dnl FIXME: What shall be done if these tools are not available?
+  RTEMS_PATH_TOOL(AR_FOR_TARGET,ar,no)
+  RTEMS_PATH_TOOL(AS_FOR_TARGET,as,no)
+  RTEMS_PATH_TOOL(LD_FOR_TARGET,ld,no)
+  RTEMS_PATH_TOOL(NM_FOR_TARGET,nm,no)
+
+dnl special treatment of ranlib
+  RTEMS_PATH_TOOL(RANLIB_FOR_TARGET,ranlib,no)
+  if test "$RANLIB_FOR_TARGET" = "no"; then
+    # ranlib wasn't found; check if ar -s is available
+    RTEMS_AR_FOR_TARGET_S
+    if test $rtems_cv_AR_FOR_TARGET_S = "yes" ; then
+      dnl override RANLIB_FOR_TARGET's cache
+      ac_cv_path_RANLIB_FOR_TARGET="$AR_FOR_TARGET -s"
+      RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET
+    else
+      AC_MSG_ERROR([***]
+        [Can't figure out how to build a library index]
+	[Neither ranlib nor ar -s seem to be available] )
+    fi
+  fi
+
+dnl NOTE: These may not be available if not using gnutools
+  RTEMS_PATH_TOOL(OBJCOPY_FOR_TARGET,objcopy,no)
+  RTEMS_PATH_TOOL(SIZE_FOR_TARGET,size,no)
+  RTEMS_PATH_TOOL(STRIP_FOR_TARGET,strip,no)
+])

aclocal/check-bsp-cache.m4

@@ -0,0 +1,17 @@
+dnl $Id$
+
+dnl RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+AC_DEFUN(RTEMS_CHECK_BSP_CACHE,
+[
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
+AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl set RTEMS_BSP
+AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
+AC_CACHE_CHECK("for RTEMS_CPU_MODEL", rtems_cv_RTEMS_CPU_MODEL,
+. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache)
+RTEMS_CPU_MODEL=$rtems_cv_RTEMS_CPU_MODEL
+AC_SUBST(RTEMS_CPU_MODEL)
+AC_CACHE_CHECK("for RTEMS_BSP_FAMILY", rtems_cv_RTEMS_BSP_FAMILY,
+. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache)
+RTEMS_BSP_FAMILY=$rtems_cv_RTEMS_BSP_FAMILY
+AC_SUBST(RTEMS_BSP_FAMILY)
+])dnl

aclocal/check-bsps.m4

@@ -1,25 +1,46 @@
-dnl Report all available bsps for a target within the source tree
+dnl $Id$
+
+dnl Report all available bsps for a target,
+dnl check if a bsp-subdirectory is present for all bsps found
 dnl
 dnl RTEMS_CHECK_BSPS(bsp_list)
-AC_DEFUN([RTEMS_CHECK_BSPS],
+AC_DEFUN(RTEMS_CHECK_BSPS,
 [
-AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
-AC_REQUIRE([RTEMS_SOURCE_TOP])dnl sets RTEMS_SOURCE_ROOT
-
-AC_MSG_CHECKING([for available BSPs])
-  $1=
-  for bsp_make in `echo "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/config 2>/dev/null`; do
-    bsp_family=`echo "$bsp_make" | sed \
-      -e "s,^${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/,," \
-      -e "s,/config$,,"`
-    for bsp_cfgs in `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/$bsp_family/config/"*.cfg 2>/dev/null`; do
-      bsp_cfg=`echo "$bsp_cfgs" | sed \
-        -e "s,^${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}/$bsp_family/config/,," \
-        -e "s,\.cfg$,,"`
-      $1="[$]$1 $bsp_cfg"
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
+AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
+AC_MSG_CHECKING([for bsps])
+    files=`ls $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU`
+    for file in $files; do
+      case $file in
+        shared*);;
+        Makefile*);;
+        READ*);;
+        CVS*);;
+        pxfl*);;
+        ac*);;
+        config*);;
+        # Now account for BSPs with build variants
+        gen68360)          rtems_bsp="$rtems_bsp gen68360 gen68360_040";;
+        p4000)             rtems_bsp="$rtems_bsp p4600 p4650";;
+        mvme162)           rtems_bsp="$rtems_bsp mvme162 mvme162lx";;
+	motorola_powerpc)  rtems_bsp="$rtems_bsp mvme2307 mcp750";;
+	pc386)             rtems_bsp="$rtems_bsp pc386 pc486 pc586 pc686";;
+        *) $1="[$]$1 $file";;
+      esac;
     done
-  done
-  AS_IF([test -z "[$]$1"],
-    [AC_MSG_RESULT([none])],
-    [AC_MSG_RESULT([$]$1)])
+dnl    ;;
+dnl esac
+AC_MSG_RESULT([[$]$1 .. done])
+])dnl
+
+AC_DEFUN(RTEMS_CHECK_CUSTOM_BSP,
+[dnl
+AC_REQUIRE([RTEMS_TOP])
+
+AC_MSG_CHECKING([for make/custom/[$]$1.cfg])
+if test -r "$srcdir/$RTEMS_TOPdir/make/custom/[$]$1.cfg"; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_ERROR([no])
+fi
 ])dnl

aclocal/check-cpu.m4

@@ -0,0 +1,17 @@
+dnl $Id$
+
+dnl check if RTEMS support a cpu
+AC_DEFUN(RTEMS_CHECK_CPU,
+[dnl
+AC_REQUIRE([RTEMS_TOP])
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
+
+# Is this a supported CPU?
+AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
+if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_ERROR(no)
+fi
+])dnl
+

aclocal/check-custom-bsp.m4

@@ -1,20 +0,0 @@
-AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
-AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
-AC_REQUIRE([RTEMS_SOURCE_TOP])dnl sets RTEMS_SOURCE_ROOT
-  $2=
-  for i in \
-    `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/config/$1 2>/dev/null`;
-  do
-    AS_IF([test -r $i],[
-      $2="$i"
-      break;
-    ])
-  done
-])
-
-AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
-  _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND])
-  AS_IF([test -z "$BSP_FOUND"],[
-    AC_MSG_ERROR([missing [$]$1.cfg])
-  ])
-])

aclocal/check-cxx.m4

@@ -0,0 +1,21 @@
+dnl $Id$
+dnl
+AC_DEFUN(RTEMS_CHECK_CXX,
+[dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
+AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl
+AC_CACHE_CHECK([whether to build rtems++],
+  rtems_cv_HAS_CPLUSPLUS,
+  [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
+      if test -n "$CXX_FOR_TARGET"; then
+        rtems_cv_HAS_CPLUSPLUS="yes"
+      else
+        rtems_cv_HAS_CPLUSPLUS="no"
+      fi
+    else
+      rtems_cv_HAS_CPLUSPLUS="no"
+    fi])
+HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
+AC_SUBST(HAS_CPLUSPLUS)dnl
+])

aclocal/check-itron.m4

@@ -0,0 +1,29 @@
+dnl $Id$
+dnl
+AC_DEFUN(RTEMS_CHECK_ITRON_API,
+[dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_ENABLE_ITRON])dnl
+
+AC_CACHE_CHECK([whether BSP supports libitron],
+  rtems_cv_HAS_ITRON_API,
+  [dnl
+    case "$RTEMS_CPU" in
+    unix*)
+      rtems_cv_HAS_ITRON_API="no"
+      ;;
+    *)
+      if test "${RTEMS_HAS_ITRON_API}" = "yes"; then
+        rtems_cv_HAS_ITRON_API="yes";
+      else
+        rtems_cv_HAS_ITRON_API="disabled";
+      fi
+      ;;
+    esac])
+if test "$rtems_cv_HAS_ITRON_API" = "yes"; then
+  HAS_ITRON_API="yes";
+else
+  HAS_ITRON_API="no";
+fi
+AC_SUBST(HAS_ITRON_API)dnl
+])

aclocal/check-multiprocessing.m4

@@ -0,0 +1,31 @@
+dnl
+dnl $Id$
+dnl
+
+AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+[dnl
+AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
+AC_REQUIRE([RTEMS_TOP])dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
+
+AC_CACHE_CHECK([whether BSP supports multiprocessing],
+  rtems_cv_HAS_MP,
+  [dnl
+    RTEMS_BSP_ALIAS(${$1},bspdir) 
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${bspdir}/shmsupp"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
+    else
+      rtems_cv_HAS_MP="no";
+    fi])
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+AC_SUBST(HAS_MP)
+])

aclocal/check-networking.m4

@@ -0,0 +1,29 @@
+dnl $Id$
+dnl
+AC_DEFUN(RTEMS_CHECK_NETWORKING,
+[dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
+
+AC_CACHE_CHECK([whether BSP supports networking],
+  rtems_cv_HAS_NETWORKING,
+  [dnl
+    case "$RTEMS_CPU" in
+    unix*)
+      rtems_cv_HAS_NETWORKING="no"
+      ;;
+    *)
+      if test "${RTEMS_HAS_NETWORKING}" = "yes"; then
+        rtems_cv_HAS_NETWORKING="yes";
+      else
+        rtems_cv_HAS_NETWORKING="disabled";
+      fi
+      ;;
+    esac])
+if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
+  HAS_NETWORKING="yes";
+else
+  HAS_NETWORKING="no";
+fi
+AC_SUBST(HAS_NETWORKING)dnl
+])

aclocal/check-newlib.m4

@@ -0,0 +1,31 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_CHECK_NEWLIB,
+[dnl
+AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
+AC_REQUIRE([RTEMS_CANONICALIZE_TOOLS])dnl
+AC_CACHE_CHECK([for newlib],
+  rtems_cv_use_newlib,
+  [
+    rtems_save_CC=$CC
+    CC=$CC_FOR_TARGET
+
+dnl some versions of newlib provide not_required_by_rtems
+    AC_TRY_LINK(
+      [extern int not_required_by_rtems() ;],
+      [not_required_by_rtems()],
+      rtems_cv_use_newlib="yes")
+
+dnl older versions of newlib provided rtems_provides_crt0
+    if test -z "$rtems_cv_use_newlib"; then
+      AC_TRY_LINK(
+        [extern int rtems_provides_crt0 ;],
+        [rtems_provides_crt0 = 0],
+        rtems_cv_use_newlib="yes",
+	rtems_cv_use_newlib="no")
+    fi
+  CC=$rtems_save_CC])
+RTEMS_USE_NEWLIB="$rtems_cv_use_newlib"
+AC_SUBST(RTEMS_USE_NEWLIB)
+])
+

aclocal/check-posix.m4

@@ -0,0 +1,30 @@
+dnl $Id$
+dnl
+AC_DEFUN(RTEMS_CHECK_POSIX_API,
+[dnl
+AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
+
+AC_CACHE_CHECK([whether BSP supports libposix],
+  rtems_cv_HAS_POSIX_API,
+  [dnl
+    case "$RTEMS_CPU" in
+    unix*)
+      rtems_cv_HAS_POSIX_API="no"
+      ;;
+    *)
+      if test "${RTEMS_HAS_POSIX_API}" = "yes"; then
+        rtems_cv_HAS_POSIX_API="yes";
+      else
+        rtems_cv_HAS_POSIX_API="disabled";
+      fi
+      ;;
+    esac])
+if test "$rtems_cv_HAS_POSIX_API" = "yes"; then
+  HAS_POSIX_API="yes";
+else
+  HAS_POSIX_API="no";
+fi
+AC_SUBST(HAS_POSIX_API)dnl
+])

aclocal/check-rdbg.m4

@@ -0,0 +1,24 @@
+dnl $Id$
+dnl
+AC_DEFUN(RTEMS_CHECK_RDBG,
+[dnl
+AC_REQUIRE([RTEMS_TOP])dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CHECK_NETWORKING])dnl
+AC_REQUIRE([RTEMS_ENABLE_RDBG])dnl
+AC_CACHE_CHECK([whether BSP supports librdbg],
+  rtems_cv_HAS_RDBG,
+  [
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/librdbg/src/${RTEMS_CPU}/${$1}";
+    then
+      rtems_cv_HAS_RDBG="yes" ;
+    elif test -d "$srcdir/${RTEMS_TOPdir}/c/src/librdbg/src/${RTEMS_CPU}/any"; 
+    then
+      rtems_cv_HAS_RDBG="yes" ;
+    else
+      rtems_cv_HAS_RDBG="no";
+    fi
+  ])
+HAS_RDBG="$rtems_cv_HAS_RDBG"
+AC_SUBST(HAS_RDBG)
+])

aclocal/check-tool.m4

@@ -1,9 +0,0 @@
-## Check for a cross tool, similar to AC_CHECK_TOOL, but do not fall back to
-## the un-prefixed version of PROG-TO-CHECK-FOR.
-dnl RTEMS_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([RTEMS_CHECK_TOOL],
-[
-  AS_IF([test "x$target_alias" != "x$host_alias"],
-    [rtems_tool_prefix=$target_alias-])
-  AC_CHECK_PROG($1, ${rtems_tool_prefix}$2, ${rtems_tool_prefix}$2, $3, $4)
-])

aclocal/enable-bare.m4

@@ -0,0 +1,21 @@
+AC_DEFUN(RTEMS_ENABLE_BARE,
+[
+AC_ARG_ENABLE(bare-cpu-cflags,
+[  --enable-bare-cpu-cflags             specify a particular cpu cflag]
+[                                       (bare bsp specific)],
+[case "${enableval}" in
+  no) BARE_CPU_CFLAGS="" ;;
+  *)    BARE_CPU_CFLAGS="${enableval}" ;;
+esac],
+[BARE_CPU_CFLAGS=""])
+
+AC_ARG_ENABLE(bare-cpu-model,
+[  --enable-bare-cpu-model              specify a particular cpu model]
+[                                       (bare bsp specific)],
+[case "${enableval}" in
+  no)   BARE_CPU_MODEL="" ;;
+  *)    BARE_CPU_MODEL="${enableval}" ;;
+esac],
+[BARE_CPU_MODEL=""])
+])
+

aclocal/enable-cxx.m4

@@ -1,11 +1,13 @@
-AC_DEFUN([RTEMS_ENABLE_CXX],
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_CXX,
 [
 AC_ARG_ENABLE(cxx,
-[AS_HELP_STRING([--enable-cxx],
-[enable C++ support])],
-[case "${enable_cxx}" in
+[  --enable-cxx                         enable C++ support,]
+[                                       and build the rtems++ library],
+[case "${enableval}" in
   yes) RTEMS_HAS_CPLUSPLUS=yes ;;
   no) RTEMS_HAS_CPLUSPLUS=no   ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-cxx option) ;;
-esac], [RTEMS_HAS_CPLUSPLUS=yes])
+esac], [RTEMS_HAS_CPLUSPLUS=no])
 ])

aclocal/enable-drvmgr.m4

@@ -1,12 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_DRVMGR],
-[
-## AC_BEFORE([$0], [RTEMS_CHECK_DRVMGR_STARTUP])dnl
-
-AC_ARG_ENABLE(drvmgr,
-[AS_HELP_STRING([--enable-drvmgr],[enable Driver Manager at Startup])],
-[case "${enableval}" in 
-  yes) RTEMS_DRVMGR_STARTUP=yes ;;
-  no) RTEMS_DRVMGR_STARTUP=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-drvmgr option) ;;
-esac],[RTEMS_DRVMGR_STARTUP=yes]) 
-])

aclocal/enable-gcc28.m4

@@ -0,0 +1,12 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_GCC28,
+[
+AC_ARG_ENABLE(gcc28,
+[  --enable-gcc28                       enable use of gcc 2.8.x features],
+[case "${enableval}" in
+  yes) RTEMS_USE_GCC272=no ;;
+  no) RTEMS_USE_GCC272=yes ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for gcc-28 option) ;;
+esac],[RTEMS_USE_GCC272=no])
+])

aclocal/enable-hwapi.m4

@@ -0,0 +1,15 @@
+dnl $Id$
+dnl
+dnl FIXME: this needs to be reworked
+
+AC_DEFUN(RTEMS_ENABLE_HWAPI,
+[dnl
+AC_ARG_ENABLE(hwapi, \
+[  --enable-hwapi                       enable hardware API library],
+[case "${enableval}" in
+    yes) RTEMS_HAS_HWAPI=yes ;;
+    no)  RTEMS_HAS_HWAPI=no ;;
+    *)  AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;;
+  esac],[RTEMS_HAS_HWAPI=no])
+AC_SUBST(RTEMS_HAS_HWAPI)dnl
+])dnl

aclocal/enable-inlines.m4

@@ -0,0 +1,13 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_INLINES,
+[AC_ARG_ENABLE(rtems-inlines,
+[  --enable-rtems-inlines               enable RTEMS inline functions]
+[                                       (default:enabled, disable to use macros)],
+[case "${enableval}" in
+  yes) RTEMS_USE_MACROS=no ;;
+  no) RTEMS_USE_MACROS=yes ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
+esac],[RTEMS_USE_MACROS=no])
+AC_SUBST(RTEMS_USE_MACROS)dnl
+])

aclocal/enable-itron.m4

@@ -0,0 +1,35 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_ITRON,
+[
+## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
+
+AC_ARG_ENABLE(itron,
+[  --enable-itron                       enable itron interface],
+[case "${enableval}" in 
+  yes) RTEMS_HAS_ITRON_API=yes ;;
+  no) RTEMS_HAS_ITRON_API=no ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for enable-itron option) ;;
+esac],[RTEMS_HAS_ITRON_API=yes]) 
+
+changequote(,)dnl
+case "${target}" in
+  # hpux unix port should go here
+  i[34567]86-pc-linux*)         # unix "simulator" port
+	RTEMS_HAS_ITRON_API=no
+	;;
+  i[34567]86-*freebsd*) # unix "simulator" port
+	RTEMS_HAS_ITRON_API=no
+	;;
+  no_cpu-*rtems*)
+	RTEMS_HAS_ITRON_API=no
+	;;
+  sparc-sun-solaris*)             # unix "simulator" port
+	RTEMS_HAS_ITRON_API=no
+	;;
+  *) 
+	;;
+esac
+changequote([,])dnl
+AC_SUBST(RTEMS_HAS_ITRON_API)
+])

aclocal/enable-libcdir.m4

@@ -0,0 +1,10 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_LIBCDIR,
+[
+AC_ARG_ENABLE(libcdir,
+[  --enable-libcdir=directory           set the directory for the C library],
+[ RTEMS_LIBC_DIR="${enableval}" ; \
+test -d ${enableval} || AC_MSG_ERROR("$enableval is not a directory" ) ] )
+AC_SUBST(RTEMS_LIBC_DIR)dnl
+])

aclocal/enable-multiprocessing.m4

@@ -1,14 +1,13 @@
-AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING,
 [
 AC_ARG_ENABLE(multiprocessing,
-[AS_HELP_STRING([--enable-multiprocessing],
-[enable multiprocessing interface; the multiprocessing interface is a
-communication interface between different RTEMS instances and allows
-synchronization of objects via message passing])],
-[case "${enable_multiprocessing}" in
-  yes) test -z $enable_rtemsbsp && AC_MSG_ERROR([Multiprocessing requires BSPs to be provided, none have, see --enable-rtemsbsp])
-       ;;
-  no) ;;
+[  --enable-multiprocessing             enable multiprocessing interface],
+[case "${enableval}" in 
+  yes) RTEMS_HAS_MULTIPROCESSING=yes ;;
+  no) RTEMS_HAS_MULTIPROCESSING=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
-esac],[enable_multiprocessing=no])
+esac],[RTEMS_HAS_MULTIPROCESSING=no])
+AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl
 ])

aclocal/enable-networking.m4

@@ -1,9 +1,11 @@
-AC_DEFUN([RTEMS_ENABLE_NETWORKING],
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_NETWORKING,
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
 
 AC_ARG_ENABLE(networking,
-[AS_HELP_STRING([--enable-networking],[enable TCP/IP stack])],
+[  --enable-networking                  enable TCP/IP stack],
 [case "${enableval}" in
   yes) RTEMS_HAS_NETWORKING=yes ;;
   no) RTEMS_HAS_NETWORKING=no ;;

aclocal/enable-paravirt.m4

@@ -1,13 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_PARAVIRT],
-[
-
-AC_ARG_ENABLE(paravirt,
-[AS_HELP_STRING([--enable-paravirt],[enable support for paravirtualization
-(default=no)])],
-
-[case "${enableval}" in 
-  yes) RTEMS_HAS_PARAVIRT=yes ;;
-  no) RTEMS_HAS_PARAVIRT=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-paravirt option) ;;
-esac],[RTEMS_HAS_PARAVIRT=no]) 
-])

aclocal/enable-posix.m4

@@ -1,21 +1,35 @@
-AC_DEFUN([RTEMS_ENABLE_POSIX],
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_POSIX,
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
 
 AC_ARG_ENABLE(posix,
-[AS_HELP_STRING([--enable-posix],[enable posix interface])],
+[  --enable-posix                       enable posix interface],
 [case "${enableval}" in 
   yes) RTEMS_HAS_POSIX_API=yes ;;
   no) RTEMS_HAS_POSIX_API=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;;
 esac],[RTEMS_HAS_POSIX_API=yes]) 
 
-case "${host}" in
+changequote(,)dnl
+case "${target}" in
+  # hpux unix port should go here
+  i[34567]86-pc-linux*)         # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
+  i[34567]86-*freebsd*) # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
   no_cpu-*rtems*)
 	RTEMS_HAS_POSIX_API=no
 	;;
+  sparc-sun-solaris*)             # unix "simulator" port
+	RTEMS_HAS_POSIX_API=no
+	;;
   *) 
 	;;
 esac
+changequote([,])dnl
 AC_SUBST(RTEMS_HAS_POSIX_API)
 ])

aclocal/enable-rdbg.m4

@@ -0,0 +1,15 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_RDBG,
+[
+AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
+
+AC_ARG_ENABLE(rdbg,
+[  --enable-rdbg                        enable remote debugger],
+[case "${enableval}" in
+  yes) RTEMS_HAS_RDBG=yes ;;
+  no) RTEMS_HAS_RDBG=no ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for enable-rdbg option) ;;
+esac],[RTEMS_HAS_RDBG=no])
+AC_SUBST(RTEMS_HAS_RDBG)dnl
+])

aclocal/enable-rtems-debug.m4

@@ -1,10 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_RTEMS_DEBUG],
-[
-AC_ARG_ENABLE(rtems-debug,
-AS_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
-[case "${enable_rtems_debug}" in
-  yes) enable_rtems_debug=yes ;;
-  no)  enable_rtems_debug=no ;;
-  *) AC_MSG_ERROR([bad value ${enable_rtems_debug} for RTEMS_DEBUG]) ;;
-esac],[enable_rtems_debug=no])
-])

aclocal/enable-rtemsbsp.m4

@@ -1,54 +1,36 @@
+dnl $Id$
+
 dnl Override the set of BSPs to be built.
 dnl used by the toplevel configure script
 dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list)
-AC_DEFUN([RTEMS_ENABLE_RTEMSBSP],
+AC_DEFUN(RTEMS_ENABLE_RTEMSBSP,
 [
-AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])
+AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])dnl
 AC_ARG_ENABLE(rtemsbsp,
-[AS_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."],
-[BSPs to include in build, required for SMP and MP builds])],
-[case "${enable_rtemsbsp}" in
-  yes ) enable_rtemsbsp="" ;;
-  no ) enable_rtemsbsp="no" ;;
-  *) enable_rtemsbsp="$enable_rtemsbsp"
-     srctop=${srcdir}
-     while test x${srctop} != x/
-     do
-       if test -d ${srctop}/cpukit -a -d ${srctop}/c/src/lib/libbsp; then
-         break
-       fi
-       srctop=$(dirname ${srctop})
-     done
-     if test x${srctop} = x/; then
-       AC_MSG_ERROR([Cannot find the top of source tree, please report to devel@rtems.org])
-     fi
-     target_arch=$(echo ${target_alias} | sed -e "s/\-.*//g")
-     libbsp=${srctop}/bsps
-     libbsp_e=$(echo ${libbsp} | sed -e 's/\//\\\//g')
-     cfg_list=$(LANG=C LC_COLLATE=C find ${libbsp} -mindepth 1 -name \*.cfg)
-     for bsp in ${enable_rtemsbsp};
-     do
-       found=no
-       for bsp_path in ${cfg_list};
-       do
-         cfg_bsp=$(echo ${bsp_path} | sed -e "s/.*\///" -e 's/\.cfg//')
-         if test x$bsp = x$cfg_bsp; then
-           cfg_arch=$(echo ${bsp_path} | sed -e "s/${libbsp_e}*\///" -e 's/\/.*//')
-           case ${target_arch} in
-             ${cfg_arch}* )
-               ;;
-             * )
-               AC_MSG_ERROR([BSP '$bsp' architecture does not match the --target architecture, run 'rtems-bsps' (in the top of the source tree) for a valid BSP list])
-               ;;
-           esac
-           found=yes
-           break
-         fi
-       done
-       if test $found = no; then
-         AC_MSG_ERROR([BSP '$bsp' not found, run 'rtems-bsps' (in the top of the source tree) for a valid BSP list])
-       fi
-     done
-     ;;
-esac],[enable_rtemsbsp=""])
+[  --enable-rtemsbsp=bsp1 bsp2 ..      BSPs to include in build],
+[case "${enableval}" in
+  yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp=\"bsp1 bsp2\"]);;
+  *) $1=$enableval;;
+esac],[$1=""])
+])
+
+dnl Pass a single BSP via an environment variable
+dnl used by per BSP configure scripts
+AC_DEFUN(RTEMS_ENV_RTEMSBSP,
+[dnl
+AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
+AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
+AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
+
+AC_MSG_CHECKING([for RTEMS_BSP])
+AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
+[dnl
+  test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP";
+])dnl
+if test -z "$rtems_cv_RTEMS_BSP"; then
+  AC_MSG_ERROR([Missing RTEMS_BSP])
+fi
+RTEMS_BSP="$rtems_cv_RTEMS_BSP"
+AC_MSG_RESULT(${RTEMS_BSP})
+AC_SUBST(RTEMS_BSP)
 ])

aclocal/enable-smp.m4

@@ -1,18 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_SMP],
-[
-## AC_BEFORE([$0], [RTEMS_CHECK_SMP])dnl
-
-AC_ARG_ENABLE(smp,
-[AS_HELP_STRING([--enable-smp],[enable support for symmetric multiprocessing
-(SMP)])],
-[case "${enableval}" in
-  yes) test -z $enable_rtemsbsp && AC_MSG_ERROR([SMP requires BSPs to be provided, none have, see --enable-rtemsbsp])
-       case "${RTEMS_CPU}" in
-         arm|powerpc|riscv*|sparc|i386) RTEMS_HAS_SMP=yes ;;
-         *)          RTEMS_HAS_SMP=no ;;
-       esac
-       ;;
-  no) RTEMS_HAS_SMP=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-smp option) ;;
-esac],[RTEMS_HAS_SMP=no])
-])

aclocal/enable-tests.m4

@@ -1,11 +1,15 @@
-AC_DEFUN([RTEMS_ENABLE_TESTS],
+dnl $Id$
+
+AC_DEFUN(RTEMS_ENABLE_TESTS,
 [
+# If the tests are enabled, then find all the test suite Makefiles
+AC_MSG_CHECKING([if the test suites are enabled? ])
 AC_ARG_ENABLE(tests,
-[AS_HELP_STRING([--enable-tests],[enable tests (default:samples)])],
+[  --enable-tests                       enable tests (default:disabled)],
   [case "${enableval}" in
-    samples) enable_tests=samples;;
-    yes) enable_tests=yes ;;
-    no)  enable_tests=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for --enable-tests]) ;;
-  esac], [enable_tests=samples])
+    yes) tests_enabled=yes ;;
+    no)  tests_enabled=no ;;
+    *)   AC_MSG_ERROR(bad value ${enableval} for tests option) ;;
+  esac], [tests_enabled=no])
+AC_MSG_RESULT([$tests_enabled])
 ])

aclocal/gcc-pipe.m4

@@ -0,0 +1,21 @@
+dnl
+dnl $Id$
+dnl
+dnl Check whether the target compiler accepts -pipe
+dnl
+
+AC_DEFUN(RTEMS_GCC_PIPE,
+[AC_REQUIRE([RTEMS_PROG_CC]) 
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts --pipe,rtems_cv_gcc_pipe,
+[
+rtems_cv_gcc_pipe=no
+if test "$rtems_cv_prog_gcc" = "yes"; then
+    echo 'void f(){}' >conftest.c
+    if test -z "`${CC_FOR_TARGET} --pipe -c conftest.c 2>&1`";then
+      rtems_cv_gcc_pipe=yes
+    fi
+    rm -f conftest*
+fi
+])
+])

aclocal/gcc-specs.m4

@@ -0,0 +1,20 @@
+dnl
+dnl $Id$
+dnl
+dnl Check whether the target compiler accepts -specs
+dnl
+
+AC_DEFUN(RTEMS_GCC_SPECS,
+[AC_REQUIRE([RTEMS_PROG_CC])
+AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts -specs,rtems_cv_gcc_specs,
+[
+rtems_cv_gcc_specs=no
+if test "$rtems_cv_prog_gcc" = "yes"; then
+  touch confspec
+  echo 'void f(){}' >conftest.c
+  if test -z "`${CC_FOR_TARGET} -specs confspec -c conftest.c 2>&1`";then
+    rtems_cv_gcc_specs=yes
+  fi
+fi
+rm -f confspec conftest*
+])])

aclocal/i386-gas-code16.m4

@@ -0,0 +1,27 @@
+dnl
+dnl  $Id$
+dnl 
+
+dnl check for i386 gas supporting 16 bit mode
+dnl     - binutils 2.9.1.0.7 and higher
+
+AC_DEFUN(RTEMS_I386_GAS_CODE16,
+[ if test "${target_cpu}" = "i386"; then
+    AC_CACHE_CHECK([for 16 bit mode assembler support],
+      rtems_cv_prog_gas_code16,
+      [cat > conftest.s << EOF
+         .code16
+         data32
+         addr32
+         lgdt 0
+EOF
+      if AC_TRY_COMMAND($AS_FOR_TARGET -o conftest.o conftest.s); then
+        rtems_cv_prog_gas_code16=yes
+      else
+        rtems_cv_prog_gas_code16=no
+      fi])
+    RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16"
+  fi
+  AC_SUBST(RTEMS_GAS_CODE16)
+])
+

aclocal/multilib.m4

@@ -1,17 +0,0 @@
-dnl This provides configure definitions used for multilib support
-
-dnl parts of these macros are derived from newlib-1.8.2's multilib support
-
-AC_DEFUN([RTEMS_ENABLE_MULTILIB],
-[
-AC_ARG_ENABLE(multilib,
-AS_HELP_STRING([--enable-multilib],
-[build many library versions (default=no)]),
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=no])dnl
-
-AM_CONDITIONAL(MULTILIB,test x"${multilib}" = x"yes")
-])

aclocal/path-ksh.m4

@@ -1,4 +1,6 @@
-AC_DEFUN([RTEMS_PATH_KSH],
+dnl $Id$
+
+AC_DEFUN(RTEMS_PATH_KSH,
 [
 dnl NOTE: prefer bash over ksh over sh
 AC_PATH_PROGS(KSH,bash ksh sh)

aclocal/path-perl.m4

@@ -0,0 +1,12 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_PATH_PERL,
+[
+AC_PATH_PROG(PERL,perl)
+if test -z "$PERL" ; then
+AC_MSG_WARN(
+[***]
+[   perl was not found]
+[   Note: Some tools will not be built.])
+fi
+])

aclocal/prog-cc.m4

@@ -0,0 +1,92 @@
+dnl
+dnl $Id$
+dnl 
+dnl Check for target gcc
+dnl
+dnl 98/05/20 Ralf Corsepius 	(corsepiu@faw.uni-ulm.de)
+dnl				Completely reworked
+
+AC_DEFUN(RTEMS_PROG_CC,
+[
+AC_BEFORE([$0], [AC_PROG_CPP])dnl
+AC_BEFORE([$0], [AC_PROG_CC])dnl
+AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
+AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
+AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
+
+dnl Only accept gcc and cc
+dnl NOTE: This might be too restrictive for native compilation
+AC_PATH_PROGS(CC_FOR_TARGET, "$program_prefix"gcc "$program_prefix"cc )
+test -z "$CC_FOR_TARGET" \
+  && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+
+dnl backup 
+rtems_save_CC=$CC
+rtems_save_CFLAGS=$CFLAGS
+
+dnl temporarily set CC
+CC=$CC_FOR_TARGET
+
+AC_PROG_CC_WORKS
+AC_PROG_CC_GNU
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+dnl Check whether -g works, even if CFLAGS is set, in case the package
+dnl plays around with CFLAGS (such as to build both debugging and
+dnl normal versions of a library), tasteless as that idea is.
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  AC_PROG_CC_G
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+rtems_cv_prog_gcc=$ac_cv_prog_gcc
+rtems_cv_prog_cc_g=$ac_cv_prog_cc_g
+rtems_cv_prog_cc_works=$ac_cv_prog_cc_works
+rtems_cv_prog_cc_cross=$ac_cv_prog_cc_cross
+
+dnl restore initial values
+CC=$rtems_save_CC
+CFLAGS=$rtems_save_CFLAGS
+
+unset ac_cv_prog_gcc
+unset ac_cv_prog_cc_g
+unset ac_cv_prog_cc_works
+unset ac_cv_prog_cc_cross
+])
+
+AC_DEFUN(RTEMS_PROG_CC_FOR_TARGET,
+[
+dnl check target cc
+RTEMS_PROG_CC
+dnl check if the compiler supports --specs
+RTEMS_GCC_SPECS
+dnl check if the target compiler may use --pipe
+RTEMS_GCC_PIPE
+dnl check if the compiler supports --specs if gcc28 is requested
+if test "$RTEMS_USE_GCC272" != "yes" ; then
+  if test "$rtems_cv_gcc_specs" = "no"; then
+    AC_MSG_WARN([*** disabling --enable-gcc28])
+      RTEMS_USE_GCC272=yes
+  fi
+fi
+test "$rtems_cv_gcc_pipe" = "yes" && CC_FOR_TARGET="$CC_FOR_TARGET --pipe"
+
+dnl FIXME: HACK for egcs/cygwin mixing '\\' and '/' in gcc -print-*
+case $host_os in
+*cygwin*)     GCCSED="| sed 's%\\\\%/%g'" ;;
+*) ;;
+esac
+AC_SUBST(GCCSED)
+])

aclocal/prog-cxx.m4

@@ -0,0 +1,81 @@
+dnl
+dnl $Id$
+dnl 
+dnl Check for target g++
+dnl 
+dnl 98/05/20 Ralf Corsepius 	(corsepiu@faw.uni-ulm.de)
+dnl				Completely reworked
+
+AC_DEFUN(RTEMS_PROG_CXX,
+[
+AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
+AC_BEFORE([$0], [AC_PROG_CXX])dnl
+AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
+AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
+AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
+
+dnl Only accept g++ and c++
+dnl NOTE: This might be too restrictive for native compilation
+AC_PATH_PROGS(CXX_FOR_TARGET, "$program_prefix"g++ "$program_prefix"c++)
+test -z "$CXX_FOR_TARGET" \
+  && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
+
+dnl backup 
+rtems_save_CXX=$CXX
+rtems_save_CXXFLAGS=$CXXFLAGS
+
+dnl temporarily set CXX
+CXX=$CXX_FOR_TARGET
+
+AC_PROG_CXX_WORKS
+AC_PROG_CXX_GNU
+
+if test $ac_cv_prog_gxx = yes; then
+  GXX=yes
+dnl Check whether -g works, even if CXXFLAGS is set, in case the package
+dnl plays around with CXXFLAGS (such as to build both debugging and
+dnl normal versions of a library), tasteless as that idea is.
+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS=
+  AC_PROG_CXX_G
+  if test "$ac_test_CXXFLAGS" = set; then
+    CXXFLAGS="$ac_save_CXXFLAGS"
+  elif test $ac_cv_prog_cxx_g = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-O2"
+  fi
+else
+  GXX=
+  test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
+fi
+
+rtems_cv_prog_gxx=$ac_cv_prog_gxx
+rtems_cv_prog_cxx_g=$ac_cv_prog_cxx_g
+rtems_cv_prog_cxx_works=$ac_cv_prog_cxx_works
+rtems_cv_prog_cxx_cross=$ac_cv_prog_cxx_cross
+
+CXX=$rtems_save_CXX
+CXXFLAGS=$rtems_save_CXXFLAGS
+
+dnl restore initial values
+unset ac_cv_prog_gxx
+unset ac_cv_prog_cc_g
+unset ac_cv_prog_cxx_works
+unset ac_cv_prog_cxx_cross
+dnl somehow autoconf macros leave this file 
+rm -f conftest.C
+])
+
+AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
+[
+  RTEMS_PROG_CXX
+  if test "$rtems_cv_prog_cc_cross" != "$rtems_cv_prog_cxx_cross"; then
+    AC_MSG_ERROR([***]
+     [Inconsistency in compiler configuration:]
+     [Target C compiler and Target C++ compiler]
+     [must both either be cross compilers or native compilers]
+     [Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
+  fi
+])

aclocal/project-root.m4

@@ -1,17 +1,27 @@
 dnl
-dnl PROJECT_TOPdir     .. relative path to the top of the build-tree
-dnl PROJECT_ROOT       .. relative path to the top of the temporary
-dnl                       installation directory inside the build-tree
-dnl RTEMS_TOPdir       .. relative path of a subpackage's configure.ac to the
-dnl                       toplevel configure.ac of the source-tree
-dnl RTEMS_ROOT         .. path to the top of a bsp's build directory
-dnl                       [Applied by custom/*.cfg, deprecated otherwise]
-dnl
+dnl $Id$
+dnl 
 
-AC_DEFUN([RTEMS_PROJECT_ROOT],
+AC_DEFUN(RTEMS_PROJECT_ROOT,
 [dnl
 AC_REQUIRE([RTEMS_TOP])
-BIN2C=rtems-bin2c
-AC_SUBST(BIN2C)
+if test "$TARGET_SUBDIR" = "." ; then
+PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)';
+else
+PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)'
+fi
+AC_SUBST(PROJECT_ROOT)
+
+RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP
+AC_SUBST(RTEMS_ROOT)
+
+PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex"
+AC_SUBST(PACKHEX)
+
+PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
+AC_SUBST(PROJECT_INCLUDE)
+
+PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP"
+AC_SUBST(PROJECT_RELEASE)
 ])
 

aclocal/quoting.m4

@@ -1,41 +0,0 @@
-dnl RTEMS_CONFIGURE_ARGS_QUOTE(dnl RETURN_VAR, [ADDITIONAL_CASES], [VAR_TO_PROCESS]])
-dnl 
-AC_DEFUN([_RTEMS_CONFIGURE_ARGS_QUOTE],
-[
-$1_prune()
-{
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  $1=
-  ac_prev=
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-	  ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-	  ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    m4_if([$2],,,[$2])
-    *) $1="$$1 '$ac_arg'" ;;
-    esac
-  done
-  export $1
-}
-])
-
-AC_DEFUN([RTEMS_CONFIGURE_ARGS_QUOTE],[
-m4_expand_once([_RTEMS_CONFIGURE_ARGS_QUOTE([$1],[$2])])
-eval $1_prune m4_if([$3],,[$ac_configure_args],[[$]$3])
-])

aclocal/rpm.m4

@@ -1,20 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_RPMPREFIX],[
-AC_ARG_ENABLE([rpmprefix],
-[  --enable-rpmprefix=<rpmprefix>      prefix rpms],
-[case $enable_rpmprefix in
-yes ) rpmprefix="rtems-"]_RTEMS_API["-";;
-no ) rpmprefix="%{nil}";;
-* ) AS_IF([test -z "$enable_rpmprefix"],
-      [rpmprefix="%{nil}"],
-      [rpmprefix="$enable_rpmprefix"]);;
-esac],
-[rpmprefix="rtems-"]_RTEMS_API["-"])
-
-AC_ARG_ENABLE([osversions],
-[  --enable-osversions       whether to use version numbers in os-tripples],
-[case $enable_osversions in
-yes ) osversion=_RTEMS_API;;
-* ) osversion=;;
-esac],
-[osversion=_RTEMS_API])
-])

aclocal/rtems-bsp-includes.m4

@@ -1,13 +0,0 @@
-dnl
-dnl RTEMS Include paths.
-dnl
-AC_DEFUN([RTEMS_BSP_INCLUDES],
-[
-AC_REQUIRE([RTEMS_SOURCE_TOP])
-AC_REQUIRE([RTEMS_BUILD_TOP])
-RTEMS_BSP_CPPFLAGS="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include \
--I${RTEMS_SOURCE_ROOT}/bsps/include \
--I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include \
--I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include"
-AC_SUBST([RTEMS_BSP_CPPFLAGS])
-])

aclocal/rtems-build-top.m4

@@ -1,12 +0,0 @@
-dnl
-dnl RTEMS_BUILD_TOP($1)
-dnl
-AC_DEFUN([RTEMS_BUILD_TOP],
-[dnl
-#
-# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to
-# copy it than attempt to clean this crap up.
-#
-RTEMS_BUILD_ROOT="${with_rtems_build_top}"
-AC_SUBST([RTEMS_BUILD_ROOT])
-])dnl

aclocal/rtems-includes.m4

@@ -1,23 +0,0 @@
-dnl
-dnl RTEMS Include paths.
-dnl
-AC_DEFUN([RTEMS_INCLUDES],
-[
-AC_REQUIRE([RTEMS_SOURCE_TOP])
-AC_REQUIRE([RTEMS_BUILD_TOP])
-
-# Was CFLAGS set?
-rtems_cv_CFLAGS_set="${CFLAGS+set}"
-
-RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include"
-RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include"
-
-RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}"
-RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include"
-
-RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}"
-
-RTEMS_CPPFLAGS="${RTEMS_INCLUDE}"
-
-AC_SUBST([RTEMS_CPPFLAGS])
-])

aclocal/rtems-source-top.m4

@@ -1,8 +0,0 @@
-dnl
-dnl RTEMS_SOURCE_TOP
-dnl
-AC_DEFUN([RTEMS_SOURCE_TOP],
-[dnl
-RTEMS_SOURCE_ROOT="${with_rtems_source_top}"
-AC_SUBST([RTEMS_SOURCE_ROOT])
-])dnl

aclocal/rtems-top.m4

@@ -1,34 +1,40 @@
-# AC_DISABLE_OPTION_CHECKING is not available before 2.62
-AC_PREREQ(2.62)
+dnl $Id$
 
 dnl
 dnl RTEMS_TOP($1)
 dnl 
-dnl $1 .. relative path from this configure.ac to the toplevel configure.ac
+dnl $1 .. relative path from this configure.in to the toplevel configure.in
 dnl
-AC_DEFUN([RTEMS_TOP],
+AC_DEFUN(RTEMS_TOP,
 [dnl
-AC_REQUIRE([RTEMS_VERSIONING])
-AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])
-AC_CONFIG_AUX_DIR([$1])
-AC_CHECK_PROGS(MAKE, gmake make)
+AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
 
-AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
+AC_ARG_WITH(target-subdir,
+[  --with-target-subdir=DIR],
+TARGET_SUBDIR="$withval",
+TARGET_SUBDIR=".")
+
+## HACK to allow gnu-make conditionals in automake-Makefiles.
+ENDIF=endif
+AC_SUBST(ENDIF)
 
 RTEMS_TOPdir="$1";
 AC_SUBST(RTEMS_TOPdir)
 
-dots=`echo $with_target_subdir|\
-sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
-PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
-AC_SUBST(PROJECT_TOPdir)
-
-PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-AC_SUBST(PROJECT_ROOT)
-
+dnl Determine RTEMS Version string from the VERSION file
+dnl Hopefully, Joel never changes its format ;-
 AC_MSG_CHECKING([for RTEMS Version])
-AC_MSG_RESULT([_RTEMS_VERSION])
-pkgdatadir="${datadir}"/rtems[]_RTEMS_API;
-AC_SUBST([pkgdatadir])
+if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then
+changequote(,)dnl
+RTEMS_VERSION=`grep Version ${srcdir}/${RTEMS_TOPdir}/VERSION | \
+sed -e 's%RTEMS[ 	]*Version[ 	]*\(.*\)[ 	]*%\1%g'`
+changequote([,])dnl
+else
+AC_MSG_ERROR(Unable to find ${RTEMS_TOPdir}/VERSION)
+fi
+if test -z "$RTEMS_VERSION"; then
+AC_MSG_ERROR(Unable to determine version)
+fi
+AC_MSG_RESULT($RTEMS_VERSION)
 ])dnl

aclocal/sysv-ipc.m4

@@ -0,0 +1,133 @@
+dnl
+dnl $Id$
+dnl
+dnl Check for System V IPC calls used by Unix simulators
+dnl
+dnl 98/07/17 Dario Alcocer     alcocer@netcom.com
+dnl 	     Ralf Corsepius    corsepiu@faw.uni-ulm.de
+dnl
+dnl Note: $host_os should probably *not* ever be used here to
+dnl determine if host supports System V IPC calls, since some
+dnl (e.g. FreeBSD 2.x) are configured by default to include only
+dnl a subset of the System V IPC calls.  Therefore, to make sure
+dnl all of the required calls are found, test for each call explicitly.
+dnl
+dnl All of the calls use IPC_PRIVATE, so tests will not unintentionally
+dnl modify any existing key sets.  See the man pages for semget, shmget, 
+dnl msgget, semctl, shmctl and msgctl for details.
+
+AC_DEFUN(RTEMS_UNION_SEMUN,
+[
+AC_CACHE_CHECK([whether $RTEMS_HOST defines union semun],
+  rtems_cv_HAS_UNION_SEMUN,
+  [AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>],
+[union semun arg ;],
+[rtems_cv_HAS_UNION_SEMUN="yes"],
+[rtems_cv_HAS_UNION_SEMUN="no"])
+
+if test "$rtems_cv_HAS_UNION_SEMUN" = "yes"; then
+    AC_DEFINE(HAS_UNION_SEMUN)
+fi])
+])
+
+AC_DEFUN(RTEMS_SYSV_SEM,
+[AC_REQUIRE([AC_PROG_CC]) 
+AC_REQUIRE([RTEMS_CANONICAL_HOST])
+AC_CACHE_CHECK(whether $RTEMS_HOST supports System V semaphores,
+rtems_cv_sysv_sem,
+[
+AC_TRY_RUN(
+[
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#if !HAS_UNION_SEMUN
+  union semun {
+    int val;
+    struct semid_ds *buf;
+    ushort *array;
+  } ;
+#endif
+int main () {
+  union semun arg ;
+
+  int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400);
+  if (id == -1)
+    exit(1);
+  arg.val = 0; /* avoid implicit type cast to union */
+  if (semctl(id, 0, IPC_RMID, arg) == -1)
+    exit(1);
+  exit(0);
+}
+],
+rtems_cv_sysv_sem="yes", rtems_cv_sysv_sem="no", :)
+])
+])
+
+AC_DEFUN(RTEMS_SYSV_SHM,
+[AC_REQUIRE([AC_PROG_CC]) 
+AC_REQUIRE([RTEMS_CANONICAL_HOST])
+AC_CACHE_CHECK(whether $RTEMS_HOST supports System V shared memory,
+rtems_cv_sysv_shm,
+[
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+int main () {
+  int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400);
+  if (id == -1)
+    exit(1);
+  if (shmctl(id, IPC_RMID, 0) == -1)
+    exit(1);
+  exit(0);
+}
+],
+rtems_cv_sysv_shm="yes", rtems_cv_sysv_shm="no", :)
+])
+])
+
+AC_DEFUN(RTEMS_SYSV_MSG,
+[AC_REQUIRE([AC_PROG_CC]) 
+AC_REQUIRE([RTEMS_CANONICAL_HOST])
+AC_CACHE_CHECK(whether $RTEMS_HOST supports System V messages,
+rtems_cv_sysv_msg,
+[
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+int main () {
+  int id=msgget(IPC_PRIVATE,IPC_CREAT|0400);
+  if (id == -1)
+    exit(1);
+  if (msgctl(id, IPC_RMID, 0) == -1)
+    exit(1);
+  exit(0);
+}
+],
+rtems_cv_sysv_msg="yes", rtems_cv_sysv_msg="no", :)
+])
+])
+
+AC_DEFUN(RTEMS_CHECK_SYSV_UNIX,
+[AC_REQUIRE([RTEMS_CANONICAL_HOST])
+if test "$RTEMS_CPU" = "unix" ; then
+  RTEMS_UNION_SEMUN
+  RTEMS_SYSV_SEM
+  if test "$rtems_cv_sysv_sem" != "yes" ; then
+    AC_MSG_ERROR([System V semaphores don't work, required by simulator])
+  fi
+  RTEMS_SYSV_SHM
+  if test "$rtems_cv_sysv_shm" != "yes" ; then
+    AC_MSG_ERROR([System V shared memory doesn't work, required by simulator])
+  fi
+  RTEMS_SYSV_MSG
+  if test "$rtems_cv_sysv_msg" != "yes" ; then
+    AC_MSG_ERROR([System V messages don't work, required by simulator])
+  fi
+fi
+])

aclocal/target.m4

@@ -0,0 +1,129 @@
+dnl $Id$
+
+AC_DEFUN(RTEMS_CONFIG_SUBDIRS,
+[
+define([RTEMS_TGT_SUBDIRS], 
+ifdef([RTEMS_TGT_SUBDIRS], [RTEMS_TGT_SUBDIRS ],)[$1])dnl
+target_subdirs="RTEMS_TGT_SUBDIRS"
+AC_SUBST(target_subdirs)
+])
+
+dnl This is a subroutine of AC_OUTPUT.
+dnl It is called after running config.status.
+dnl AC_OUTPUT_SUBDIRS(DIRECTORY...)
+AC_DEFUN(RTEMS_OUTPUT_SUBDIRS,
+[
+if test "$no_recursion" != yes; then
+  if test $target_alias != $host_alias; then 
+    target_subdir="$target_alias"
+  else
+    target_subdir="."
+  fi
+  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  ac_sub_configure_args=
+  ac_prev=
+  for ac_arg in $ac_configure_args; do
+    if test -n "$ac_prev"; then
+      ac_prev=
+      continue
+    fi
+    case "$ac_arg" in
+    -cache-file | --cache-file | --cache-fil | --cache-fi \
+    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+      ac_prev=cache_file ;;
+    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+      ;;
+    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+      ac_prev=srcdir ;;
+    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+      ;;
+    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+    esac
+  done
+
+  test -d $target_subdir || mkdir $target_subdir
+  for ac_config_dir in $1; do
+
+    # Do not complain, so a configure script can configure whichever
+    # parts of a large source tree are present.
+    if test ! -d $srcdir/$ac_config_dir; then
+      continue
+    fi
+
+    echo configuring in $target_subdir/$ac_config_dir
+
+    case "$srcdir" in
+##    .) ;;
+    *)
+      if test -d $target_subdir/$ac_config_dir || mkdir $target_subdir/$ac_config_dir; then :;
+      else
+        AC_MSG_ERROR(can not create `pwd`/$target_subdir/$ac_config_dir)
+      fi
+      ;;
+    esac
+
+    ac_popdir=`pwd`
+    cd $target_subdir/$ac_config_dir
+
+changequote(, )dnl
+      # A "../" for each directory in /$ac_config_dir.
+      ac_dots=`echo $target_subdir/$ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+changequote([, ])dnl
+
+    case "$srcdir" in
+##    .) # No --srcdir option.  We are building in place.
+##      ac_sub_srcdir=$srcdir ;;
+    /*) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure; then
+      ac_sub_configure=$ac_sub_srcdir/configure
+    elif test -f $ac_sub_srcdir/configure.in; then
+      ac_sub_configure=$ac_configure
+    else
+      AC_MSG_WARN(no configuration information is in $ac_config_dir)
+      ac_sub_configure=
+    fi
+
+    # The recursion is here.
+    if test -n "$ac_sub_configure"; then
+
+      # Make the cache file name correct relative to the subdirectory.
+      if test "$target_alias" != "$host_alias"; then
+      ac_sub_cache_file=$cache_file
+      else
+      case "$cache_file" in
+      /*) ac_sub_cache_file=$cache_file ;;
+      *) # Relative path.
+        ac_sub_cache_file="$ac_dots$cache_file" ;;
+      esac
+      fi
+ifdef([AC_PROVIDE_AC_PROG_INSTALL],
+      [  case "$ac_given_INSTALL" in
+changequote(, )dnl
+        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+changequote([, ])dnl
+        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+        esac
+])dnl
+
+      echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
+      # The eval makes quoting arguments work.
+      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \
+	$ac_sub_configure_args --srcdir=$ac_sub_srcdir \
+	--with-target-subdir=$target_subdir --cache-file=$ac_sub_cache_file 
+      then :
+      else
+        AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir)
+      fi
+    fi
+
+    cd $ac_popdir
+  done
+fi
+])

aclocal/tool-paths.m4

@@ -1,4 +1,4 @@
-AC_DEFUN([RTEMS_TOOLPATHS],
+AC_DEFUN(RTEMS_TOOLPATHS,
 [
 # tooldir='$(exec_prefix)/'$target_alias
 # Temporary work-around until building in source tree is supported

aclocal/tool-prefix.m4

@@ -0,0 +1,22 @@
+dnl
+dnl  $Id$
+dnl 
+dnl Set program_prefix
+dnl
+dnl 98/05/20 Ralf Corsepius	(corsepiu@faw.uni-ulm.de)
+dnl				Extracted from configure
+
+AC_DEFUN(RTEMS_TOOL_PREFIX,
+[AC_REQUIRE([AC_CANONICAL_TARGET])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+
+changequote(,)dnl
+if [ "${program_prefix}" = "NONE" ] ; then
+  if [ "${target}" = "${host}" ] ; then
+    program_prefix=
+  else
+    program_prefix=${target}-
+  fi
+fi
+changequote([,])dnl
+])

aclocal/version.m4

@@ -1,4 +0,0 @@
-AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[5.0.0]))
-
-m4_define([_RTEMS_API],[5])

automake/host.am

@@ -1,5 +1,28 @@
+## $Id$
+
 ## NOTE: This is a temporary work-around to keep 
 ## RTEMS's non automake standard make targets working.
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
+debug:
+	@echo
+	@echo "\"make debug\" is obsolete, instead use:"
+	@echo "	make VARIANT=DEBUG"
+	@echo
+
+.PHONY: debug
+
+profile:
+	@echo
+	@echo "\"make profile\" is obsolete, instead use:"
+	@echo "	make VARIANT=PROFILE"
+	@echo
+
+preinstall-am: $(PREINSTALL_FILES)
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+depend-am:
+depend: depend-am
+.PHONY: depend depend-am

automake/leaf.am

@@ -0,0 +1,9 @@
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+ifndef make-cxx-exe
+define make-cxx-exe
+	$(LINK.cc) $(AM_CFLAGS) $(AM_LDFLAGS) \
+	$(LDLIBS) -o $@ \
+	$(LINK_OBJS) $(LINK_LIBS)
+endef
+@ENDIF@

automake/lib.am

@@ -0,0 +1,18 @@
+##
+##  $Id$
+##
+
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+define make-library
+$(RM) $@
+$(AR) $(ARFLAGS) $@ $^
+$(RANLIB) $@
+endef
+
+$(PROJECT_RELEASE)/lib:
+	@$(mkinstalldirs) $@
+
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib
+
+.PRECIOUS: $(LIB)

automake/local.am

@@ -0,0 +1,80 @@
+## $Id$
+
+## NOTE: This is a temporary work-around to keep 
+## RTEMS's non automake standard make targets working.
+## Once automake is fully integrated these make targets 
+## and this file will probably be removed
+
+## translate VARIANT into VARIANT_V
+VARIANT = OPTIMIZE
+
+VARIANT_OPTIMIZE_V = OPTIMIZE
+VARIANT_DEBUG_V = DEBUG
+VARIANT_PROFILE_V = PROFILE
+VARIANT_optimize_V = OPTIMIZE
+VARIANT_debug_V = DEBUG
+VARIANT_profile_V = PROFILE
+
+VARIANT_V = $(VARIANT_$(VARIANT)_V)
+
+## Setup the variant build subdirectory
+ARCH_OPTIMIZE_V = o-optimize
+ARCH_DEBUG_V = o-debug
+ARCH_PROFILE_V = o-profile
+
+ARCH__V = $(ARCH_OPTIMIZE_V)
+ARCH = $(ARCH_$(VARIANT_V)_V)
+
+## Setup the library suffix
+LIBSUFFIX_OPTIMIZE_V =
+LIBSUFFIX_DEBUG_V = _g
+LIBSUFFIX_PROFILE_V = _p
+
+LIBSUFFIX__V = $(LIBSUFFIX_OPTIMIZE_V)
+LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V)
+
+LIBSUFFIX_VA = $(LIB_VARIANT).a
+
+## These are supposed to be set in make/custom/<bsp>.cfg
+## CFLAGS_OPTIMIZE_V = 
+## CFLAGS_DEBUG_V =
+## CFLAGS_PROFILE_V =
+
+CFLAGS__V = $(CFLAGS_OPTIMIZE_V)
+AM_CFLAGS += $(CFLAGS_$(VARIANT_V)_V)
+
+debug:
+	@echo
+	@echo "\"make debug\" is obsolete, instead use:"
+	@echo "	make VARIANT=DEBUG"
+	@echo
+
+.PHONY: debug
+
+profile:
+	@echo
+	@echo "\"make profile\" is obsolete, instead use:"
+	@echo "	make VARIANT=PROFILE"
+	@echo
+
+.PHONY: profile
+
+preinstall-am: $(PREINSTALL_FILES)
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+depend-am:
+depend: depend-am
+.PHONY: depend depend-am
+
+${ARCH}:
+	mkdir ${ARCH}
+
+clean-local:
+	$(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
+	$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp
+
+distclean-local:
+	$(RM) Depends-o-optimize Depends-o-debug Depends-o-profile
+
+PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools

automake/subdirs.am

@@ -1,3 +1,5 @@
+## $Id$
+
 ## Borrowed from automake-1.4 and adapted to RTEMS 
 
 ## NOTE: This is a temporary work-around to keep 
@@ -5,3 +7,30 @@
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
+depend-recursive \
+preinstall-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+## This trick allows "-k" to keep its natural meaning when running a
+## recursive rule.
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+preinstall: preinstall-recursive
+.PHONY: preinstall-recursive
+
+depend: depend-recursive
+.PHONY: depend-recursive

bootstrap

@@ -3,43 +3,40 @@
 # helps bootstrapping, when checked out from CVS
 # requires GNU autoconf and GNU automake
 #
+# $Id$
+
 # this is not meant to be exported outside the source tree
-#
+
 # NOTE: Inspired by libtool's autogen script
-#
+
 # to be run from the toplevel directory of RTEMS'
 # source tree
 
 progname=`basename $0`
 top_srcdir=`dirname $0`
 
-LC_ALL=C
-export LC_ALL
-
-verbose=""
+verbose="";
 quiet="false"
-mode="autoreconf"
-force=0
+mode="generate"
 
 usage()
 {
   echo
-  echo "usage: ${progname} [-c|-h|-H] [-q][-v]"
+  echo "usage: ${progname} [-h|-q|-v]"
   echo
   echo "options:"
+  echo "	-h .. display this message and exit";
+  echo "	-q .. quiet, don't display directories";
+  echo "	-v .. verbose, pass -v to automake when invoking automake"
   echo "	-c .. clean, remove all aclocal/autoconf/automake generated files"
-  echo "	-h .. display this message and exit"
-  echo "	-H .. regenerate headers.am files"
-  echo "	-q .. quiet, don't display directories"
-  echo "	-v .. verbose, pass -v to autotools"
   echo
-  exit 1
+  exit 1;
 }
 
-if test ! -f $top_srcdir/aclocal/version.m4; then
+if test ! -f $top_srcdir/VERSION; then
   echo "${progname}:"
-  echo "	Installation problem: Can't find file aclocal/version.m4"
-  exit 1
+  echo "	Installation problem: Can't find file VERSION"
+  exit 1;
 fi
 
 while test $# -gt 0; do
@@ -47,206 +44,40 @@ case $1 in
 -h|--he|--hel|--help)
   usage ;;
 -q|--qu|--qui|--quie|--quiet)
-  quiet="true"
+  quiet="true";
   shift;;
 -v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
-  verbose="-v"
+  verbose="-v";
   shift;;
 -c|--cl|--cle|--clea|--clean)
-  mode="clean"
+  mode="clean";
   shift;;
--f|--fo|--for|--forc|--force)
-  force=`expr $force + 1`
-  shift;;
--H|--headers)
-  mode="headers"
-  shift;;
--r|--re|--rec|--reco|--recon|--reconf)
-  mode="autoreconf"
-  shift;;
--g|--ge|--gen|--gene|--gener|--genera|--generat|--generate)
-  mode="generate"
-  shift;;
--*) echo "unknown option $1"
+-*) echo "unknown option $1" ;
   usage ;;
-*) echo "invalid parameter $1"
+*) echo "invalid parameter $1" ;
   usage ;;
 esac
 done
 
 case $mode in
-headers)
-  if test "." != "$top_srcdir"; then
-    echo "To generate the headers.am you must call the script via \"./$progname -H\""
-    exit 1
-  fi
-  base="$PWD"
-
-  # Generate cpukit/header-dirs.am
-  tmp="$base/cpukit/header-dirs.am.new"
-  hdr_dirs=`for i in cpukit/include cpukit/libnetworking cpukit/score/cpu/*/include ; do
-    cd "$i"
-    find -mindepth 1 -type d
-    cd "$base"
-  done | sort -u | sed 's%^\./%%'`
-  echo '## This file was generated by "./boostrap -H".' > "$tmp"
-  echo 'include_HEADERS =' >> "$tmp"
-  for dir in $hdr_dirs ; do
-    am_dir=`echo $dir | sed 's%[/-]%_%g'`
-    echo "include_${am_dir}dir = \$(includedir)/$dir" >> "$tmp"
-    echo "include_${am_dir}_HEADERS =" >> "$tmp"
-  done
-  diff -q "$tmp" "cpukit/header-dirs.am" || mv "$tmp" "cpukit/header-dirs.am"
-  rm -f "$tmp"
-
-  # Generate cpukit/*/headers.am
-  tmp="$base/headers.am.new"
-  cpukit="$base/cpukit"
-  cd "$cpukit"
-  for inc in include score/cpu/*/include ; do
-    echo '## This file was generated by "./boostrap -H".' > "$tmp"
-    hdr=`dirname $inc`
-    am_dir=""
-    cd $inc
-    for b in `find -type d | sort` ; do
-      for j in `find $b -mindepth 1 -maxdepth 1 -name '*.h' | sed 's%^\.%%' | sed 's%^/%%' | sort` ; do
-        dir=`dirname $j`
-        if test x$dir != x. ; then
-          am_dir=`echo $dir | sed 's%[/-]%_%g'`
-          am_dir="_$am_dir"
-        else
-          am_dir=""
-        fi
-        echo "include${am_dir}_HEADERS += $inc/$j" >> "$tmp"
-      done
-    done
-    cd "$cpukit"
-    diff -q "$tmp" "${hdr}/headers.am" || mv "$tmp" "${hdr}/headers.am"
-  done
-  rm -f "$tmp"
-  cd "$base"
-
-  # Generate bsps/*/headers.am
-  tmp="$base/headers.am.new"
-  for i in bsps/include bsps/*/include bsps/*/*/include ; do
-    dir=""
-    am_dir=""
-    echo '## This file was generated by "./boostrap -H".' > "$tmp"
-    case $i in
-      bsps/*/*/include)
-        hdr="../"
-        inc="../../../../../../$i/"
-        ;;
-      bsps/*/include)
-        hdr="../"
-        inc="../../../../../$i/"
-        ;;
-      bsps/include)
-        hdr="../"
-        inc="../../$i/"
-        ;;
-      *)
-        hdr=""
-        inc=""
-        ;;
-    esac
-    cd $i
-    for b in `find -type d | sort` ; do
-      for j in `find $b -mindepth 1 -maxdepth 1 -name '*.h' -or -name '*.inc' | sed 's%^\.%%' | sed 's%^/%%' | sort` ; do
-        d=`dirname $j`
-        if test x$d != x$dir ; then
-          dir=$d
-          if test x$d != x. ; then
-            am_dir=`echo $dir | sed 's%[/-]%_%g'`
-            am_dir="_$am_dir"
-            printf "\ninclude%sdir = \$(includedir)/$dir\n" "$am_dir" >> "$tmp"
-          else
-            am_dir=""
-            echo "" >> "$tmp"
-          fi
-          echo "include${am_dir}_HEADERS =" >> "$tmp"
-        fi
-        echo "include${am_dir}_HEADERS += $inc$j" >> "$tmp"
-        if test $j = bsp.h ; then
-          echo "include_HEADERS += include/bspopts.h" >> "$tmp"
-        fi
-      done
-    done
-    cd "$base"
-    diff -q "$tmp" "$i/${hdr}headers.am" || mv "$tmp" "$i/${hdr}headers.am"
-  done
-  rm -f "$tmp"
-  ;;
-
 generate)
-  AUTOCONF=${AUTOCONF-autoconf}
-  if test -z "$AUTOCONF"; then
-    echo "You must have autoconf installed to run $program"
-    exit 1
-  fi
-
-  AUTOHEADER=${AUTOHEADER-autoheader}
-  if test -z "$AUTOHEADER"; then
-    echo "You must have autoconf installed to run $program"
-    exit 1
-  fi
-
-  AUTOMAKE=${AUTOMAKE-automake}
-  if test -z "$AUTOMAKE"; then
-    echo "You must have automake installed to run $program"
-    exit 1
-  fi
-
-  ACLOCAL=${ACLOCAL-aclocal}
-  if test -z "$ACLOCAL"; then
-    echo "You must have automake installed to run $program"
-    exit 1
-  fi
 
   case $top_srcdir in
-  /* ) aclocal_dir=$top_srcdir
+  /* ) aclocal_dir=$top_srcdir/aclocal
     ;;
-  *) aclocal_dir=`pwd`/$top_srcdir
+  *) aclocal_dir=`pwd`/$top_srcdir/aclocal
     ;;
   esac
 
-  confs=`find . \( -name 'configure.in' -o -name 'configure.ac' \) -print`
+  confs=`find . -name 'configure.in' -print`
   for i in $confs; do
-  dir=`dirname $i`
-  configure=`basename $i`
-  ( test "$quiet" = "true" || echo "$dir"
-    cd $dir
-    pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
-    aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
-      sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat `
-    test "$verbose" = "-v" && echo "${ACLOCAL} $aclocal_args"
-    ${ACLOCAL} $aclocal_args
-    test -n "`grep CONFIG_HEADER ${configure}`" && ${AUTOHEADER} \
-      && test "$verbose" = "-v" && echo "${AUTOHEADER}"
-    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && ${AUTOHEADER} \
-      && test "$verbose" = "-v" && echo "${AUTOHEADER}"
-    test -f Makefile.am && ${AUTOMAKE} -a -c $verbose
-    ${AUTOCONF}
-    test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
-      && echo timestamp > stamp-h.in
-  )
-  done
-  ;;
-
-autoreconf)
-  AUTORECONF=${AUTORECONF-autoreconf}
-  if test -z "$AUTORECONF"; then
-    echo "You must have autoreconf installed to run $program"
-    exit 1
-  fi
-
-  confs=`find . -name 'configure.ac' -print`
-  for i in $confs; do
-  dir=`dirname $i`
-  configure=`basename $i`
-  ( test "$quiet" = "true" || echo "$dir"
-    cd $dir
-    ${AUTORECONF} -i --no-recursive $verbose
+  dir=`dirname $i`;
+  ( test "$quiet" = "true" || echo "$dir";
+    cd $dir;
+    aclocal -I $aclocal_dir;
+    autoconf;
+    test -n "`grep CONFIG_HEADER configure.in`" && autoheader ;
+    test -f Makefile.am && automake $verbose ;
     test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
       && echo timestamp > stamp-h.in
   )
@@ -255,72 +86,37 @@ autoreconf)
 
 clean)
   test "$quiet" = "true" || echo "removing automake generated Makefile.in files"
-  files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'`
-  for i in $files; do
-    if test -f $i; then
-      rm -f $i
-      test "$verbose" = "-v" && echo "$i"
-    fi
-  done
+  files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;
+  for i in $files; do if test -f $i; then
+    rm -f $i
+    test "$verbose" = "-v" && echo "$i"    
+  fi; done
 
   test "$quiet" = "true" || echo "removing configure files"
-  files=`find . -name 'configure' -print`
-  for i in $files; do
-    if test -f $i; then
-      rm -f $i
-      test "$verbose" = "-v" && echo "$i"
-    fi
-  done
-
-  if test $force -gt 0; then
-    needles=""
-    if test $force -gt 1; then
-      # Manually maintained
-      needles="$needles config.sub"
-      needles="$needles config.guess"
-    fi
-    if test $force -gt 0; then
-      # Inherited from automake
-      needles="$needles compile"
-      needles="$needles depcomp"
-      needles="$needles install-sh"
-      needles="$needles missing"
-      needles="$needles mdate-sh"
-    fi
-    for j in $needles; do
-      files=`find . -name "$j" -print`
-      for i in $files; do
-        if test -f $i; then
-          rm -f $i
-          test "$verbose" = "-v" && echo "$i"
-        fi
-      done
-    done
-  fi
-
+  files=`find . -name 'configure' -print` ;
+  test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
+  for i in $files; do if test -f $i; then
+    rm -f $i
+    test "$verbose" = "-v" && echo "$i"    
+  fi; done
+  
   test "$quiet" = "true" || echo "removing aclocal.m4 files"
-  files=`find . -name 'aclocal.m4' -print`
-  test "$verbose" = "-v" && test -n "$files" && echo "$files"
-  for i in $files; do
-    if test -f $i; then
-      rm -f $i
-      test "$verbose" = "-v" && echo "$i"
-    fi
-  done
+  files=`find . -name 'aclocal.m4' -print` ;
+  test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
+  for i in $files; do if test -f $i; then
+    rm -f $i
+    test "$verbose" = "-v" && echo "$i"    
+  fi; done
 
   find . -name '*~' -print | xargs rm -f
-  find . -name 'bspopts.h.in' -print | xargs rm -f
   find . -name '*.orig' -print | xargs rm -f
   find . -name '*.rej' -print | xargs rm -f
   find . -name 'config.status' -print | xargs rm -f
   find . -name 'config.log' -print | xargs rm -f
   find . -name 'config.cache' -print | xargs rm -f
-  find . -name 'Makefile' -and -not -path ./testsuites/ada/sptests/sp19/Makefile -print | xargs rm -f
+  find . -name 'Makefile' -print | xargs rm -f
   find . -name '.deps' -print | xargs rm -rf
   find . -name '.libs' -print | xargs rm -rf
   find . -name 'stamp-h.in' | xargs rm -rf
-  find . -name 'autom4te*.cache' | xargs rm -rf
   ;;
 esac
-
-exit 0

bsps/arm/altera-cyclone-v/README

@@ -1,44 +0,0 @@
-Overview
---------
-Evaluation board for this BSP: 
-- Cyclone V SoC FPGA Development Kit
-- DK-DEV-5CSXC6N/ES-0L
-
-RTC
----
-The evaluation board contains a DS1339C RTC connected to I2C0. To use it you
-have to set the following options:
-
-  #define CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
-  #define CONFIGURE_BSP_PREREQUISITE_DRIVERS I2C_DRIVER_TABLE_ENTRY
-
-Additional there has to be one free file descriptor to access the i2c. Set the
-CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS accordingly.
-
-Network
--------
-The default PHY address can be overwritten by the application. To do this, the
-drv_ctrl pointer of the rtems_bsdnet_ifconfig structure should point to a
-dwmac_ifconfig_drv_ctrl object with the appropriate settings before the
-rtems_bsdnet_initialize_network() is called. E.g.:
-
-  #include <libchip/dwmac.h>
-  #include <bsp.h>
-
-  static dwmac_ifconfig_drv_ctrl drv_ctrl = {
-    .phy_addr = 1
-  };
-
-  ...
-
-  static struct rtems_bsdnet_ifconfig some_ifconfig = {
-    .name = RTEMS_BSP_NETWORK_DRIVER_NAME,
-    .attach = RTEMS_BSP_NETWORK_DRIVER_ATTACH,
-    .drv_ctrl = &drv_ctrl
-  };
-
-  ...
-
-  rtems_bsdnet_initialize_network();
-
-If drv_ctrl is the NULL pointer, default values will be used instead.

bsps/arm/altera-cyclone-v/config/altcycv.inc

@@ -1,12 +0,0 @@
-include $(RTEMS_ROOT)/make/custom/default.cfg
-
-RTEMS_CPU = arm
-
-CPU_CFLAGS = -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard -mtune=cortex-a9
-
-#CFLAGS_OPTIMIZE_V ?= -O0 -g
-CFLAGS_OPTIMIZE_V ?= -O2 -g
-
-# Add CFLAGS and LDFLAGS for compiling and linking with per item sections
-CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections
-LDFLAGS            = -Wl,--gc-sections

bsps/arm/altera-cyclone-v/config/altcycv_devkit.cfg

@@ -1 +0,0 @@
-include $(RTEMS_ROOT)/make/custom/altcycv.inc

bsps/arm/altera-cyclone-v/console/console-config.c

@@ -1,164 +0,0 @@
-/**
- * @file
- *
- * @ingroup RTEMSBSPsARMCycV
- */
-
-/*
- * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info@embedded-brains.de>
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#include <libchip/ns16550.h>
-
-#include <rtems/bspIo.h>
-
-#include <bsp.h>
-#include <bsp/irq.h>
-#include <bsp/alt_clock_manager.h>
-#include <bsp/console-termios.h>
-#include <bsp/socal/alt_rstmgr.h>
-#include <bsp/socal/socal.h>
-#include <bsp/socal/alt_uart.h>
-#include <bsp/socal/hps.h>
-
-#ifdef BSP_USE_UART_INTERRUPTS
-  #define DEVICE_FNS &ns16550_handler_interrupt
-#else
-  #define DEVICE_FNS &ns16550_handler_polled
-#endif
-
-static uint8_t altera_cyclone_v_uart_get_register(uintptr_t addr, uint8_t i)
-{
-  volatile uint32_t *reg = (volatile uint32_t *) addr;
-
-  return (uint8_t) reg [i];
-}
-
-static void altera_cyclone_v_uart_set_register(uintptr_t addr, uint8_t i, uint8_t val)
-{
-  volatile uint32_t *reg = (volatile uint32_t *) addr;
-
-  reg [i] = val;
-}
-
-static bool altera_cyclone_v_uart_probe(
-  rtems_termios_device_context *base,
-  uint32_t uart_set_mask
-)
-{
-  ns16550_context *ctx = (ns16550_context *) base;
-  bool            ret           = true;
-  uint32_t        ucr;
-  ALT_STATUS_CODE sc;
-  void*           location = (void *) ctx->port;
-
-  /* The ALT_CLK_L4_SP is required for all SoCFPGA UARTs. 
-   * Check that it's enabled. */
-  if ( alt_clk_is_enabled(ALT_CLK_L4_SP) != ALT_E_TRUE ) {
-    ret = false;
-  }
-
-  if ( ret ) {
-    sc = alt_clk_freq_get(ALT_CLK_L4_SP, &ctx->clock);
-    if ( sc != ALT_E_SUCCESS ) {
-      ret = false;
-    }
-  }
-
-  if ( ret ) {
-    // Bring UART out of reset.
-    alt_clrbits_word(ALT_RSTMGR_PERMODRST_ADDR, uart_set_mask);
-
-    // Verify the UCR (UART Component Version)
-    ucr = alt_read_word( ALT_UART_UCV_ADDR( location ) );
-    if ( ucr != ALT_UART_UCV_UART_COMPONENT_VER_RESET ) {
-      ret = false;
-    }
-  }
-
-  if ( ret ) {
-    // Write SRR::UR (Shadow Reset Register :: UART Reset)
-    alt_write_word( ALT_UART_SRR_ADDR( location ), ALT_UART_SRR_UR_SET_MSK );
-
-    // Read the MSR to work around case:119085.
-    (void)alt_read_word( ALT_UART_MSR_ADDR( location ) );
-
-    ret = ns16550_probe( base );
-  }
-
-  return ret;
-}
-
-#ifdef CYCLONE_V_CONFIG_CONSOLE
-static bool altera_cyclone_v_uart_probe_0(rtems_termios_device_context *base)
-{
-  return altera_cyclone_v_uart_probe(base, ALT_RSTMGR_PERMODRST_UART0_SET_MSK);
-}
-
-static ns16550_context altera_cyclone_v_uart_context_0 = {
-  .base = RTEMS_TERMIOS_DEVICE_CONTEXT_INITIALIZER("UART 0"),
-  .get_reg = altera_cyclone_v_uart_get_register,
-  .set_reg = altera_cyclone_v_uart_set_register,
-  .port = (uintptr_t) ALT_UART0_ADDR,
-  .irq = ALT_INT_INTERRUPT_UART0,
-  .initial_baud = CYCLONE_V_UART_BAUD
-};
-#endif
-
-#ifdef CYCLONE_V_CONFIG_UART_1
-static bool altera_cyclone_v_uart_probe_1(rtems_termios_device_context *base)
-{
-  return altera_cyclone_v_uart_probe(base, ALT_RSTMGR_PERMODRST_UART1_SET_MSK);
-}
-
-static ns16550_context altera_cyclone_v_uart_context_1 = {
-  .base = RTEMS_TERMIOS_DEVICE_CONTEXT_INITIALIZER("UART 1"),
-  .get_reg = altera_cyclone_v_uart_get_register,
-  .set_reg = altera_cyclone_v_uart_set_register,
-  .port = (uintptr_t) ALT_UART1_ADDR,
-  .irq = ALT_INT_INTERRUPT_UART1,
-  .initial_baud = CYCLONE_V_UART_BAUD
-};
-#endif
-
-const console_device console_device_table[] = {
-  #ifdef CYCLONE_V_CONFIG_CONSOLE
-    {
-      .device_file = "/dev/ttyS0",
-      .probe = altera_cyclone_v_uart_probe_0,
-      .handler = DEVICE_FNS,
-      .context = &altera_cyclone_v_uart_context_0.base
-    },
-  #endif
-  #ifdef CYCLONE_V_CONFIG_UART_1
-    {
-      .device_file = "/dev/ttyS1",
-      .probe = altera_cyclone_v_uart_probe_1,
-      .handler = DEVICE_FNS,
-      .context = &altera_cyclone_v_uart_context_1.base
-    },
-  #endif
-};
-
-const size_t console_device_count = RTEMS_ARRAY_SIZE(console_device_table);
-
-static void output_char(char c)
-{
-  rtems_termios_device_context *ctx = console_device_table[0].context;
-
-  ns16550_polled_putchar( ctx, c );
-}
-
-BSP_output_char_function_type BSP_output_char = output_char;
-
-BSP_polling_getchar_function_type BSP_poll_char = NULL;

bsps/arm/altera-cyclone-v/contrib/doxygen.h

@@ -1,85 +0,0 @@
-/**
- * @defgroup RTEMSBSPsARMCycVContrib Contributed Code
- *
- * @ingroup RTEMSBSPsARMCycV
- *
- * @brief Contributed code from Altera.
- */
-
-/**
- * @defgroup CACHE_MGR Cache Management API
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup ALT_DMA DMA Controller API
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup ALT_DMA_COMMON DMA Controller Common API Definitions
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup ALT_DMA_PRG DMA Controller Programming API
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup ALT_I2C I2C Controller API
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup INT_COMMON Interrupt Controller Common Definitions
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup ALT_QSPI QSPI Flash Controller Module
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup ALT_SOCAL_UTIL SoCAL Utilities
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup ADDR_SPACE_MGR The Address Space Manager
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup CLK_MGR The Clock Manager API
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup ALT_GPIO_API The General Purpose Input/Output Manager API
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup RST_MGR The Reset Manager
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/**
- * @defgroup UART UART Driver API
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */

bsps/arm/altera-cyclone-v/contrib/hwlib/README.txt

@@ -1,19 +0,0 @@
-HWLIB
-=====
-Hwlib is a collection of sources provided by Altera for the Cyclone-V.
-
-As hwlib is third party software, please keep modifications and additions 
-to the sources to a minimum for easy maintenance. Otherwise updating to a 
-new version of hwlib released by Altera can become difficult.
-
-The hwlib directory contains only those files from Alteras hwlib which are
-required by the BSP (the whole hwlib was considered too big).
-The directory structure within the hwlib directory is equivalent to Alteras
-hwlib directory structure. For easy maintenance only whole files have been
-left out.
-
-Altera provides the hwlib with their SoC Embedded Design Suite (EDS).
-
-HWLIB Version:
---------------
-All files are from hwlib 13.1 distributed with SoC EDS 14.0.0.200.

bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_address_space.c

@@ -1,515 +0,0 @@
-/**
- * @file
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/******************************************************************************
- *
- * alt_address_space.c - API for the Altera SoC FPGA address space.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * Copyright 2013 Altera Corporation. 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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "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 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.
- * 
- ******************************************************************************/
-
-#include <stddef.h>
-#include <bsp/alt_address_space.h>
-#include <bsp/socal/alt_l3.h>
-#include <bsp/socal/socal.h>
-#include <bsp/socal/alt_acpidmap.h>
-#include <bsp/hwlib.h>
-
-
-#define ALT_ACP_ID_MAX_INPUT_ID     7
-#define ALT_ACP_ID_MAX_OUTPUT_ID    4096
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_addr_space_remap(ALT_ADDR_SPACE_MPU_ATTR_t mpu_attr,
-                                     ALT_ADDR_SPACE_NONMPU_ATTR_t nonmpu_attr,
-                                     ALT_ADDR_SPACE_H2F_BRIDGE_ATTR_t h2f_bridge_attr,
-                                     ALT_ADDR_SPACE_LWH2F_BRIDGE_ATTR_t lwh2f_bridge_attr)
-{
-    uint32_t remap_reg_val = 0;
-
-    // Parameter checking and validation...
-    if (mpu_attr == ALT_ADDR_SPACE_MPU_ZERO_AT_BOOTROM)
-    {
-        remap_reg_val |= ALT_L3_REMAP_MPUZERO_SET(ALT_L3_REMAP_MPUZERO_E_BOOTROM);
-    }
-    else if (mpu_attr == ALT_ADDR_SPACE_MPU_ZERO_AT_OCRAM)
-    {
-        remap_reg_val |= ALT_L3_REMAP_MPUZERO_SET(ALT_L3_REMAP_MPUZERO_E_OCRAM);
-    }
-    else
-    {
-        return ALT_E_INV_OPTION;
-    }
-
-    if (nonmpu_attr == ALT_ADDR_SPACE_NONMPU_ZERO_AT_SDRAM)
-    {
-        remap_reg_val |= ALT_L3_REMAP_NONMPUZERO_SET(ALT_L3_REMAP_NONMPUZERO_E_SDRAM);
-    }
-    else if (nonmpu_attr == ALT_ADDR_SPACE_NONMPU_ZERO_AT_OCRAM)
-    {
-        remap_reg_val |= ALT_L3_REMAP_NONMPUZERO_SET(ALT_L3_REMAP_NONMPUZERO_E_OCRAM);
-    }
-    else
-    {
-        return ALT_E_INV_OPTION;
-    }
-
-    if (h2f_bridge_attr == ALT_ADDR_SPACE_H2F_INACCESSIBLE)
-    {
-        remap_reg_val |= ALT_L3_REMAP_H2F_SET(ALT_L3_REMAP_H2F_E_INVISIBLE);
-    }
-    else if (h2f_bridge_attr == ALT_ADDR_SPACE_H2F_ACCESSIBLE)
-    {
-        remap_reg_val |= ALT_L3_REMAP_H2F_SET(ALT_L3_REMAP_H2F_E_VISIBLE);
-    }
-    else
-    {
-        return ALT_E_INV_OPTION;
-    }
-
-    if (lwh2f_bridge_attr == ALT_ADDR_SPACE_LWH2F_INACCESSIBLE)
-    {
-        remap_reg_val |= ALT_L3_REMAP_LWH2F_SET(ALT_L3_REMAP_LWH2F_E_INVISIBLE);
-    }
-    else if (lwh2f_bridge_attr == ALT_ADDR_SPACE_LWH2F_ACCESSIBLE)
-    {
-        remap_reg_val |= ALT_L3_REMAP_LWH2F_SET(ALT_L3_REMAP_LWH2F_E_VISIBLE);
-    }
-    else
-    {
-        return ALT_E_INV_OPTION;
-    }
-
-    // Perform the remap.
-    alt_write_word(ALT_L3_REMAP_ADDR, remap_reg_val);
-
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-// Remap the MPU address space view of address 0 to access the SDRAM controller.
-// This is done by setting the L2 cache address filtering register start address
-// to 0 and leaving the address filtering address end address value
-// unmodified. This causes all physical addresses in the range
-// address_filter_start <= physical_address < address_filter_end to be directed
-// to the to the AXI Master Port M1 which is connected to the SDRAM
-// controller. All other addresses are directed to AXI Master Port M0 which
-// connect the MPU subsystem to the L3 interconnect.
-//
-// It is unnecessary to modify the MPU remap options in the L3 remap register
-// because those options only affect addresses in the MPU subsystem address
-// ranges that are now redirected to the SDRAM controller and never reach the L3
-// interconnect anyway.
-ALT_STATUS_CODE alt_mpu_addr_space_remap_0_to_sdram(void)
-{
-    uint32_t addr_filt_end = (alt_read_word(L2_CACHE_ADDR_FILTERING_END_ADDR) &
-                              L2_CACHE_ADDR_FILTERING_END_ADDR_MASK);
-    return alt_l2_addr_filter_cfg_set(0x0, addr_filt_end);
-}
-
-/******************************************************************************/
-// Return the L2 cache address filtering registers configuration settings in the
-// user provided start and end address range out parameters.
-ALT_STATUS_CODE alt_l2_addr_filter_cfg_get(uint32_t* addr_filt_start,
-                                           uint32_t* addr_filt_end)
-{
-    if (addr_filt_start == NULL || addr_filt_end == NULL)
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    uint32_t addr_filt_start_reg = alt_read_word(L2_CACHE_ADDR_FILTERING_START_ADDR);
-    uint32_t addr_filt_end_reg   = alt_read_word(L2_CACHE_ADDR_FILTERING_END_ADDR);
-
-    *addr_filt_start = (addr_filt_start_reg & L2_CACHE_ADDR_FILTERING_START_ADDR_MASK);
-    *addr_filt_end = (addr_filt_end_reg & L2_CACHE_ADDR_FILTERING_END_ADDR_MASK);
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_l2_addr_filter_cfg_set(uint32_t addr_filt_start,
-                                           uint32_t addr_filt_end)
-{
-    // Address filtering start and end values must be 1 MB aligned.
-    if (  (addr_filt_start & ~L2_CACHE_ADDR_FILTERING_START_ADDR_MASK)
-       || (addr_filt_end   & ~L2_CACHE_ADDR_FILTERING_END_ADDR_MASK)  )
-    {
-        return ALT_E_ARG_RANGE;
-    }
-
-    // While it is possible to set the address filtering end value above its
-    // reset value and thereby access a larger SDRAM address range, it is not
-    // recommended. Doing so would potentially obscure any mapped HPS to FPGA
-    // bridge address spaces and peripherals on the L3 interconnect.
-    if (addr_filt_end > L2_CACHE_ADDR_FILTERING_END_RESET)
-    {
-        return ALT_E_ARG_RANGE;
-    }
-
-    // NOTE: ARM (ARM DDI 0246F CoreLink Level 2 Cache Controller L2C-310 TRM)
-    // recommends programming the Address Filtering End Register before the
-    // Address Filtering Start Register to avoid unpredictable behavior between
-    // the two writes.
-    alt_write_word(L2_CACHE_ADDR_FILTERING_END_ADDR, addr_filt_end);
-    // It is recommended that address filtering always remain enabled.
-    addr_filt_start |= L2_CACHE_ADDR_FILTERING_ENABLE_MASK;
-    alt_write_word(L2_CACHE_ADDR_FILTERING_START_ADDR, addr_filt_start);
-
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_acp_id_map_fixed_read_set(const uint32_t input_id,
-                                              const uint32_t output_id,
-                                              const ALT_ACP_ID_MAP_PAGE_t page,
-                                              const uint32_t aruser)
-{
-    if (input_id > ALT_ACP_ID_OUT_DYNAM_ID_7 || output_id == ALT_ACP_ID_MAX_OUTPUT_ID)
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    switch (output_id)
-    {
-    case ALT_ACP_ID_OUT_FIXED_ID_2:
-        alt_write_word(ALT_ACPIDMAP_VID2RD_ADDR,
-                         ALT_ACPIDMAP_VID2RD_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID2RD_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID2RD_USER_SET(aruser)
-                       | ALT_ACPIDMAP_VID2RD_FORCE_SET(1UL));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_3:
-        alt_write_word(ALT_ACPIDMAP_VID3RD_ADDR,
-                         ALT_ACPIDMAP_VID3RD_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID3RD_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID3RD_USER_SET(aruser)
-                       | ALT_ACPIDMAP_VID3RD_FORCE_SET(1UL));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_4:
-        alt_write_word(ALT_ACPIDMAP_VID4RD_ADDR,
-                         ALT_ACPIDMAP_VID4RD_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID4RD_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID4RD_USER_SET(aruser)
-                       | ALT_ACPIDMAP_VID4RD_FORCE_SET(1UL));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_5:
-        alt_write_word(ALT_ACPIDMAP_VID5RD_ADDR,
-                         ALT_ACPIDMAP_VID5RD_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID5RD_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID5RD_USER_SET(aruser)
-                       | ALT_ACPIDMAP_VID5RD_FORCE_SET(1UL));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_6:
-        alt_write_word(ALT_ACPIDMAP_VID6RD_ADDR,
-                         ALT_ACPIDMAP_VID6RD_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID6RD_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID6RD_USER_SET(aruser)
-                       | ALT_ACPIDMAP_VID6RD_FORCE_SET(1UL));
-        break;
-    default:
-        return ALT_E_BAD_ARG;
-    }
-
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_acp_id_map_fixed_write_set(const uint32_t input_id,
-                                               const uint32_t output_id,
-                                               const ALT_ACP_ID_MAP_PAGE_t page,
-                                               const uint32_t awuser)
-{
-    if (input_id > ALT_ACP_ID_OUT_DYNAM_ID_7 || output_id == ALT_ACP_ID_MAX_OUTPUT_ID)
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    switch (output_id)
-    {
-    case ALT_ACP_ID_OUT_FIXED_ID_2:
-        alt_write_word(ALT_ACPIDMAP_VID2WR_ADDR,
-                         ALT_ACPIDMAP_VID2WR_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID2WR_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID2WR_USER_SET(awuser)
-                       | ALT_ACPIDMAP_VID2WR_FORCE_SET(1UL));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_3:
-        alt_write_word(ALT_ACPIDMAP_VID3WR_ADDR,
-                         ALT_ACPIDMAP_VID3WR_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID3WR_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID3WR_USER_SET(awuser)
-                       | ALT_ACPIDMAP_VID3WR_FORCE_SET(1UL));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_4:
-        alt_write_word(ALT_ACPIDMAP_VID4WR_ADDR,
-                         ALT_ACPIDMAP_VID4WR_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID4WR_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID4WR_USER_SET(awuser)
-                       | ALT_ACPIDMAP_VID4WR_FORCE_SET(1UL));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_5:
-        alt_write_word(ALT_ACPIDMAP_VID5WR_ADDR,
-                         ALT_ACPIDMAP_VID5WR_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID5WR_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID5WR_USER_SET(awuser)
-                       | ALT_ACPIDMAP_VID5WR_FORCE_SET(1UL));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_6:
-        alt_write_word(ALT_ACPIDMAP_VID6WR_ADDR,
-                         ALT_ACPIDMAP_VID6WR_MID_SET(input_id)
-                       | ALT_ACPIDMAP_VID6WR_PAGE_SET(page)
-                       | ALT_ACPIDMAP_VID6WR_USER_SET(awuser)
-                       | ALT_ACPIDMAP_VID6WR_FORCE_SET(1UL)
-            );
-        break;
-    default:
-        return ALT_E_BAD_ARG;
-    }
-
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_acp_id_map_dynamic_read_set(const uint32_t output_id)
-{
-    if (output_id == ALT_ACP_ID_MAX_OUTPUT_ID)
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    uint32_t aruser, page;
-
-    switch (output_id)
-    {
-    case ALT_ACP_ID_OUT_FIXED_ID_2:
-        aruser = ALT_ACPIDMAP_VID2RD_USER_GET(alt_read_word(ALT_ACPIDMAP_VID2RD_ADDR));
-        page = ALT_ACPIDMAP_VID2RD_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID2RD_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_3:
-        aruser = ALT_ACPIDMAP_VID3RD_USER_GET(alt_read_word(ALT_ACPIDMAP_VID3RD_ADDR));
-        page = ALT_ACPIDMAP_VID3RD_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID3RD_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_4:
-        aruser = ALT_ACPIDMAP_VID4RD_USER_GET(alt_read_word(ALT_ACPIDMAP_VID4RD_ADDR));
-        page = ALT_ACPIDMAP_VID4RD_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID4RD_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_5:
-        aruser = ALT_ACPIDMAP_VID5RD_USER_GET(alt_read_word(ALT_ACPIDMAP_VID5RD_ADDR));
-        page = ALT_ACPIDMAP_VID5RD_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID5RD_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_6:
-        aruser = ALT_ACPIDMAP_VID6RD_USER_GET(alt_read_word(ALT_ACPIDMAP_VID6RD_ADDR));
-        page = ALT_ACPIDMAP_VID6RD_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID6RD_ADDR));
-        break;
-    default:
-        return ALT_E_BAD_ARG;
-    }
-
-    alt_write_word(ALT_ACPIDMAP_DYNRD_ADDR,
-                     ALT_ACPIDMAP_DYNRD_PAGE_SET(page)
-                   | ALT_ACPIDMAP_DYNRD_USER_SET(aruser));
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_acp_id_map_dynamic_write_set(const uint32_t output_id)
-{
-    if (output_id == ALT_ACP_ID_MAX_OUTPUT_ID)
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    uint32_t awuser, page;
-
-    switch (output_id)
-    {
-    case ALT_ACP_ID_OUT_FIXED_ID_2:
-        awuser = ALT_ACPIDMAP_VID2WR_USER_GET(alt_read_word(ALT_ACPIDMAP_VID2WR_ADDR));
-        page   = ALT_ACPIDMAP_VID2WR_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID2WR_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_3:
-        awuser = ALT_ACPIDMAP_VID3WR_USER_GET(alt_read_word(ALT_ACPIDMAP_VID3WR_ADDR));
-        page   = ALT_ACPIDMAP_VID3WR_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID3WR_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_4:
-        awuser = ALT_ACPIDMAP_VID4WR_USER_GET(alt_read_word(ALT_ACPIDMAP_VID4WR_ADDR));
-        page   = ALT_ACPIDMAP_VID4WR_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID4WR_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_5:
-        awuser = ALT_ACPIDMAP_VID5WR_USER_GET(alt_read_word(ALT_ACPIDMAP_VID5WR_ADDR));
-        page   = ALT_ACPIDMAP_VID5WR_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID5WR_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_6:
-        awuser = ALT_ACPIDMAP_VID6WR_USER_GET(alt_read_word(ALT_ACPIDMAP_VID6WR_ADDR));
-        page   = ALT_ACPIDMAP_VID6WR_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID6WR_ADDR));
-        break;
-    default:
-        return ALT_E_BAD_ARG;
-    }
-
-    alt_write_word(ALT_ACPIDMAP_DYNWR_ADDR,
-                     ALT_ACPIDMAP_DYNWR_PAGE_SET(page)
-                   | ALT_ACPIDMAP_DYNWR_USER_SET(awuser));
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_acp_id_map_dynamic_read_options_set(const ALT_ACP_ID_MAP_PAGE_t page,
-                                                        const uint32_t aruser)
-{
-    alt_write_word(ALT_ACPIDMAP_DYNRD_ADDR,
-                     ALT_ACPIDMAP_DYNRD_PAGE_SET(page)
-                   | ALT_ACPIDMAP_DYNRD_USER_SET(aruser));
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_acp_id_map_dynamic_write_options_set(const ALT_ACP_ID_MAP_PAGE_t page,
-                                                         const uint32_t awuser)
-{
-    alt_write_word(ALT_ACPIDMAP_DYNWR_ADDR,
-                     ALT_ACPIDMAP_DYNWR_PAGE_SET(page)
-                   | ALT_ACPIDMAP_DYNWR_USER_SET(awuser));
-    return ALT_E_SUCCESS;
-}
-
-/******************************************************************************/
-ALT_STATUS_CODE alt_acp_id_map_read_options_get(const uint32_t output_id,
-                                                bool * fixed,
-                                                uint32_t * input_id,
-                                                ALT_ACP_ID_MAP_PAGE_t * page,
-                                                uint32_t * aruser)
-{
-    if (output_id == ALT_ACP_ID_MAX_OUTPUT_ID)
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    switch (output_id)
-    {
-    case ALT_ACP_ID_OUT_FIXED_ID_2:
-        *aruser   = ALT_ACPIDMAP_VID2RD_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID2RD_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID2RD_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID2RD_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID2RD_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID2RD_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID2RD_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID2RD_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_3:
-        *aruser   = ALT_ACPIDMAP_VID3RD_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID3RD_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID3RD_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID3RD_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID3RD_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID3RD_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID3RD_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID3RD_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_4:
-        *aruser   = ALT_ACPIDMAP_VID4RD_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID4RD_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID4RD_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID4RD_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID4RD_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID4RD_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID4RD_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID4RD_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_5:
-        *aruser   = ALT_ACPIDMAP_VID5RD_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID5RD_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID5RD_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID5RD_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID5RD_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID5RD_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID5RD_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID5RD_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_6:
-        *aruser   = ALT_ACPIDMAP_VID6RD_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID6RD_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID6RD_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID6RD_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID6RD_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID6RD_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID6RD_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID6RD_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_7:
-        *aruser   = ALT_ACPIDMAP_DYNRD_S_USER_GET(alt_read_word(ALT_ACPIDMAP_DYNRD_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_DYNRD_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_DYNRD_S_ADDR));
-        break;
-    default:
-        return ALT_E_BAD_ARG;
-    }
-
-    return ALT_E_SUCCESS;
-}
-
-ALT_STATUS_CODE alt_acp_id_map_write_options_get(const uint32_t output_id,
-                                                 bool * fixed,
-                                                 uint32_t * input_id,
-                                                 ALT_ACP_ID_MAP_PAGE_t * page,
-                                                 uint32_t * awuser)
-{
-    if (output_id == ALT_ACP_ID_MAX_OUTPUT_ID)
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    switch (output_id)
-    {
-    case ALT_ACP_ID_OUT_FIXED_ID_2:
-        *awuser   = ALT_ACPIDMAP_VID2WR_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID2WR_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID2WR_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID2WR_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID2WR_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID2WR_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID2WR_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID2WR_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_3:
-        *awuser   = ALT_ACPIDMAP_VID3WR_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID3WR_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID3WR_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID3WR_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID3WR_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID3WR_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID3WR_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID3WR_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_4:
-        *awuser   = ALT_ACPIDMAP_VID4WR_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID4WR_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID4WR_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID4WR_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID4WR_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID4WR_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID4WR_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID4WR_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_5:
-        *awuser   = ALT_ACPIDMAP_VID5WR_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID5WR_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID5WR_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID5WR_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID5WR_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID5WR_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID5WR_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID5WR_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_6:
-        *awuser   = ALT_ACPIDMAP_VID6WR_S_USER_GET(alt_read_word(ALT_ACPIDMAP_VID6WR_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_VID6WR_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_VID6WR_S_ADDR));
-        *input_id = ALT_ACPIDMAP_VID6WR_S_MID_GET(alt_read_word(ALT_ACPIDMAP_VID6WR_S_ADDR));
-        *fixed    = ALT_ACPIDMAP_VID6WR_S_FORCE_GET(alt_read_word(ALT_ACPIDMAP_VID6WR_S_ADDR));
-        break;
-    case ALT_ACP_ID_OUT_DYNAM_ID_7:
-        *awuser   = ALT_ACPIDMAP_DYNWR_S_USER_GET(alt_read_word(ALT_ACPIDMAP_DYNWR_S_ADDR));
-        *page     = (ALT_ACP_ID_MAP_PAGE_t)ALT_ACPIDMAP_DYNWR_S_PAGE_GET(alt_read_word(ALT_ACPIDMAP_DYNWR_S_ADDR));
-        break;
-    default:
-        return ALT_E_BAD_ARG;
-    }
-
-    return ALT_E_SUCCESS;
-}

bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_generalpurpose_io.c

@@ -1,783 +0,0 @@
-/**
- * @file
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-/******************************************************************************
-*
-* Copyright 2013 Altera Corporation. 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. The name of the author may not be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "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 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.
-*
-******************************************************************************/
-
-#include    <stdint.h>
-#include    <stdlib.h>
-#include    <stdbool.h>
-
-#include    <bsp/socal/hps.h>
-#include    <bsp/socal/socal.h>
-#include    <bsp/socal/alt_gpio.h>
-#include    <bsp/socal/alt_rstmgr.h>
-#include    <bsp/hwlib.h>
-#include    <bsp/alt_generalpurpose_io.h>
-
-
-/****************************************************************************************/
-/******************************* Useful local definitions *******************************/
-/****************************************************************************************/
-
-#define     ALT_GPIO_EOPA       ALT_GPIO_1BIT_28
-#define     ALT_GPIO_EOPB       ALT_GPIO_1BIT_57
-#define     ALT_GPIO_EOPC       ALT_HLGPI_15
-#define     ALT_GPIO_BITMASK    0x1FFFFFFF
-
-            // expands the zero or one bit to the 29-bit GPIO word
-#define     ALT_GPIO_ALLORNONE(tst)  ((uint32_t) ((tst == 0) ? 0 : ALT_GPIO_BITMASK))
-
-
-/****************************************************************************************/
-/* alt_gpio_init() initializes the GPIO modules 										*/
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_init(void)
-{
-		// put GPIO modules into system manager reset if not already there
-	alt_gpio_uninit();
-		// release GPIO modules from system reset (w/ two-instruction delay)
-	alt_replbits_word(ALT_RSTMGR_PERMODRST_ADDR, ALT_RSTMGR_PERMODRST_GPIO0_SET_MSK |
-			ALT_RSTMGR_PERMODRST_GPIO1_SET_MSK |
-			ALT_RSTMGR_PERMODRST_GPIO2_SET_MSK, 0);
-	return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_uninit() uninitializes the GPIO modules			     				       	*/
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_uninit(void)
-{
-	// put all GPIO modules into system manager reset
-	alt_replbits_word(ALT_RSTMGR_PERMODRST_ADDR, ALT_RSTMGR_PERMODRST_GPIO0_SET_MSK |
-			ALT_RSTMGR_PERMODRST_GPIO1_SET_MSK |
-			ALT_RSTMGR_PERMODRST_GPIO2_SET_MSK,
-			ALT_GPIO_BITMASK);
-	return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_datadir_set() sets the specified GPIO data bits to use the data        */
-/* direction(s) specified. 0 = input (default). 1 = output.                             */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_datadir_set(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask, uint32_t config)
-{
-    volatile uint32_t   *addr;
-
-    if ((mask & ~ALT_GPIO_BITMASK) || (config & ~ALT_GPIO_BITMASK))  { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_SWPORTA_DDR_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_SWPORTA_DDR_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_SWPORTA_DDR_ADDR; }
-    else { return ALT_E_BAD_ARG; }
-
-    alt_replbits_word(addr, mask, config);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/*  alt_gpio_port_datadir_get() returns the data direction configuration of selected    */
-/* bits of the designated GPIO module.                                                  */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_datadir_get(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_SWPORTA_DDR_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_SWPORTA_DDR_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_SWPORTA_DDR_ADDR; }
-    else { return 0; }
-
-    return alt_read_word(addr) & mask;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_data_write() sets the GPIO data outputs of the specified GPIO module   */
-/* to a one or zero. Actual outputs are only set if the data direction for that bit(s)  */
-/* has previously been set to configure them as output(s).                              */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_data_write(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask, uint32_t val)
-{
-    volatile uint32_t   *addr;
-
-    if ((mask & ~ALT_GPIO_BITMASK) || (val & ~ALT_GPIO_BITMASK))  { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_SWPORTA_DR_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_SWPORTA_DR_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_SWPORTA_DR_ADDR; }
-    else { return ALT_E_BAD_ARG; }
-
-    alt_replbits_word(addr, mask, val);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_data_read() returns the value of the data inputs of the specified      */
-/* GPIO module. Data direction for these bits must have been previously set to inputs.  */
-/****************************************************************************************/
-
-#if (!ALT_GPIO_DATAREAD_TEST_MODE)
-    /* This is the production code version. For software unit testing, set the      */
-    /* ALT_GPIO_DATAREAD_TEST_MODE flag to true in the makefile, which will compile */
-    /* the GPIO test software version of alt_gpio_port_data_read() instead.         */
-
-uint32_t alt_gpio_port_data_read(ALT_GPIO_PORT_t gpio_pid, uint32_t mask)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_EXT_PORTA_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_EXT_PORTA_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_EXT_PORTA_ADDR; }
-    else { return 0; }
-
-    return alt_read_word(addr) & mask;
-}
-#endif
-
-
-/****************************************************************************************/
-/* alt_gpio_port_int_type_set() sets selected signals of the specified GPIO port to     */
-/* be either level-sensitive ( =0) or edge-triggered ( =1).                             */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_int_type_set(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask, uint32_t config)
-{
-    volatile uint32_t   *addr;
-
-    if ((mask & ~ALT_GPIO_BITMASK) || (config & ~ALT_GPIO_BITMASK))  { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTTYPE_LEVEL_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTTYPE_LEVEL_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTTYPE_LEVEL_ADDR; }
-    else { return ALT_E_BAD_ARG; }
-
-    alt_replbits_word(addr, mask, config);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_int_type_get() returns the interrupt configuration (edge-triggered or  */
-/* level-triggered) for the specified signals of the specified GPIO module.             */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_int_type_get(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTTYPE_LEVEL_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTTYPE_LEVEL_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTTYPE_LEVEL_ADDR; }
-    else { return 0; }
-
-    return alt_read_word(addr) & mask;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_int_pol_set() sets the interrupt polarity of the signals of the        */
-/* specified GPIO register (when used as inputs) to active-high ( =0) or active-low     */
-/* ( =1).                                                                               */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_int_pol_set(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask, uint32_t config)
-{
-    volatile uint32_t   *addr;
-
-    if ((mask & ~ALT_GPIO_BITMASK) || (config & ~ALT_GPIO_BITMASK))  { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INT_POL_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INT_POL_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INT_POL_ADDR; }
-    else { return ALT_E_BAD_ARG; }
-
-    alt_replbits_word(addr, mask, config);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_int_pol_get() returns the active-high or active-low polarity           */
-/* configuration for the possible interrupt sources of the specified GPIO module.       */
-/* 0 = The interrupt polarity for this bit is set to active-low mode. 1 = The           */
-/* interrupt polarity for this bit is set to active-highmode.                           */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_int_pol_get(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INT_POL_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INT_POL_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INT_POL_ADDR; }
-    else { return 0; }
-
-    return alt_read_word(addr) & mask;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_debounce_set() sets the debounce configuration for input signals of    */
-/* the specified GPIO module. 0 - Debounce is not selected for this signal (default).   */
-/* 1 - Debounce is selected for this signal.                                            */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_debounce_set(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask, uint32_t config)
-{
-    volatile uint32_t   *addr;
-
-    if ((mask & ~ALT_GPIO_BITMASK) || (config & ~ALT_GPIO_BITMASK))  { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_DEBOUNCE_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_DEBOUNCE_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_DEBOUNCE_ADDR; }
-    else { return ALT_E_BAD_ARG; }
-
-    alt_replbits_word(addr, mask, config);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_debounce_get() returns the debounce configuration for the input        */
-/* signals of the specified GPIO register. 0 - Debounce is not selected for this        */
-/* signal. 1 - Debounce is selected for this signal.                                    */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_debounce_get(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_DEBOUNCE_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_DEBOUNCE_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_DEBOUNCE_ADDR; }
-    else { return 0; }
-
-    return alt_read_word(addr) & mask;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_sync_set() sets the synchronization configuration for the signals of   */
-/* the specified GPIO register. This allows for synchronizing level-sensitive           */
-/* interrupts to the internal clock signal. This is a port-wide option that controls    */
-/* all level-sensitive interrupt signals of that GPIO port.                             */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_sync_set(ALT_GPIO_PORT_t gpio_pid, uint32_t config)
-{
-    volatile uint32_t   *addr;
-
-    config = (config != 0) ? 1 : 0;
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_LS_SYNC_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_LS_SYNC_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_LS_SYNC_ADDR; }
-    else { return ALT_E_BAD_ARG; }
-
-    alt_write_word(addr, config);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_sync_get() returns the synchronization configuration for the signals   */
-/* of the specified GPIO register. This allows for synchronizing level-sensitive        */
-/* interrupts to the internal clock signal. This is a port-wide option that controls    */
-/* all level-sensitive interrupt signals of that GPIO port.                             */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_sync_get(ALT_GPIO_PORT_t gpio_pid)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_LS_SYNC_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_LS_SYNC_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_LS_SYNC_ADDR; }
-    else { return ALT_E_BAD_ARG; }         // error
-
-    return (alt_read_word(addr) != 0) ? ALT_E_TRUE : ALT_E_FALSE;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_config() configures a group of GPIO signals with the same parameters.  */
-/* Allows for configuring all parameters of a given port at one time.                   */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_config(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask, ALT_GPIO_PIN_DIR_t dir, ALT_GPIO_PIN_TYPE_t type,
-        ALT_GPIO_PIN_POL_t pol, ALT_GPIO_PIN_DEBOUNCE_t debounc,
-        uint32_t data)
-{
-    ALT_STATUS_CODE     ret;
-
-        // set all affected GPIO bits to inputs
-    ret = alt_gpio_port_datadir_set(gpio_pid, mask, ALT_GPIO_ALLORNONE(ALT_GPIO_PIN_INPUT));
-                // the ALT_GPIO_ALLORNONE() macro expands the zero or one bit to the 29-bit GPIO word
-
-        // set trigger type
-    if (ret == ALT_E_SUCCESS)
-    {
-        ret = alt_gpio_port_int_type_set(gpio_pid, mask, ALT_GPIO_ALLORNONE(type));
-    }
-
-        // set polarity
-    if (ret == ALT_E_SUCCESS)
-    {
-        alt_gpio_port_int_pol_set(gpio_pid, mask, ALT_GPIO_ALLORNONE(pol));
-    }
-
-        // set debounce
-    if (ret == ALT_E_SUCCESS)
-    {
-        alt_gpio_port_debounce_set(gpio_pid, mask, ALT_GPIO_ALLORNONE(debounc));
-    }
-
-        // set data output(s)
-    if (ret == ALT_E_SUCCESS)
-    {
-        alt_gpio_port_data_write(gpio_pid, mask, ALT_GPIO_ALLORNONE(data));
-    }
-
-    if (ret == ALT_E_SUCCESS)
-    {
-        // set data direction of one or more bits to select output
-        ret = alt_gpio_port_datadir_set(gpio_pid, mask, ALT_GPIO_ALLORNONE(dir));
-    }
-
-    return ret;
-}
-
-
-/****************************************************************************************/
-/* Enables the specified GPIO data register interrupts.                                 */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_int_enable(ALT_GPIO_PORT_t gpio_pid, uint32_t config)
-{
-    volatile uint32_t   *addr;
-
-    if (config & ~ALT_GPIO_BITMASK)      { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTEN_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTEN_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTEN_ADDR; }
-    else { return ALT_E_BAD_ARG; }
-
-    alt_replbits_word(addr, config, UINT32_MAX);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* Disables the specified GPIO data module interrupts.                                  */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_int_disable(ALT_GPIO_PORT_t gpio_pid, uint32_t config)
-{
-    volatile uint32_t   *addr;
-
-    if (config & ~ALT_GPIO_BITMASK)      { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTEN_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTEN_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTEN_ADDR; }
-    else { return ALT_E_BAD_ARG; }
-
-    alt_replbits_word(addr, config, 0);
-    return ALT_E_SUCCESS;
-}
-
-
-
-/****************************************************************************************/
-/* Get the current state of the specified GPIO port interrupts enables.                 */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_int_enable_get(ALT_GPIO_PORT_t gpio_pid)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTEN_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTEN_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTEN_ADDR; }
-    else { return 0; }
-
-    return alt_read_word(addr);
-}
-
-
-/****************************************************************************************/
-/* Masks or unmasks selected interrupt source bits of the data register of the          */
-/* specified GPIO module. Uses a second bit mask to determine which signals may be      */
-/* changed by this call.                                                                */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_int_mask_set(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t mask, uint32_t val)
-{
-    volatile uint32_t   *addr;
-
-    if ((mask & ~ALT_GPIO_BITMASK) || (val & ~ALT_GPIO_BITMASK))  { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTMSK_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTMSK_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTMSK_ADDR; }
-    else { return ALT_E_BAD_ARG; }         // argument error
-
-    alt_replbits_word(addr, mask, val);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/* Returns the interrupt source mask of the specified GPIO module.                      */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_int_mask_get(ALT_GPIO_PORT_t gpio_pid)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTMSK_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTMSK_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTMSK_ADDR; }
-    else { return 0; }         // error
-
-    return alt_read_word(addr);
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_int_status_get() returns the interrupt pending status of all signals   */
-/* of the specified GPIO register.                                                      */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_int_status_get(ALT_GPIO_PORT_t gpio_pid)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTSTAT_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTSTAT_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTSTAT_ADDR; }
-    else { return 0; }         // error
-
-    return alt_read_word(addr);
-}
-
-
-/****************************************************************************************/
-/* Clear the interrupt pending status of selected signals of the specified GPIO         */
-/* register.                                                                            */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_port_int_status_clear(ALT_GPIO_PORT_t gpio_pid,
-        uint32_t clrmask)
-{
-    volatile uint32_t   *addr;
-
-    if (clrmask & ~ALT_GPIO_BITMASK)      { return ALT_E_ERROR; }
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_INTSTAT_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_INTSTAT_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_INTSTAT_ADDR; }
-    else { return ALT_E_BAD_ARG; }         // argument error
-
-    alt_write_word(addr, clrmask);
-    return ALT_E_SUCCESS;
-}
-
-
-/****************************************************************************************/
-/*  alt_gpio_port_idcode_get() returns the ID code of the specified GPIO module.        */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_idcode_get(ALT_GPIO_PORT_t gpio_pid)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_ID_CODE_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_ID_CODE_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_ID_CODE_ADDR; }
-    else { return 0; }
-
-    return alt_read_word(addr);
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_port_ver_get() returns the version code of the specified GPIO module.       */
-/****************************************************************************************/
-
-uint32_t alt_gpio_port_ver_get(ALT_GPIO_PORT_t gpio_pid)
-{
-    volatile uint32_t   *addr;
-
-    if (gpio_pid == ALT_GPIO_PORTA)      { addr = ALT_GPIO0_VER_ID_CODE_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTB) { addr = ALT_GPIO1_VER_ID_CODE_ADDR; }
-    else if (gpio_pid == ALT_GPIO_PORTC) { addr = ALT_GPIO2_VER_ID_CODE_ADDR; }
-    else { return 0; }
-
-    return alt_read_word(addr);
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_bit_config() configures one bit (signal) of the GPIO ports.                 */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_bit_config(ALT_GPIO_1BIT_t signal_num,
-        ALT_GPIO_PIN_DIR_t dir, ALT_GPIO_PIN_TYPE_t type,
-        ALT_GPIO_PIN_POL_t pol, ALT_GPIO_PIN_DEBOUNCE_t debounce,
-        ALT_GPIO_PIN_DATA_t data)
-{
-    ALT_GPIO_PORT_t     pid;
-    uint32_t            mask;
-
-    pid = alt_gpio_bit_to_pid(signal_num);
-    mask = 0x1 << alt_gpio_bit_to_port_pin(signal_num);
-    return alt_gpio_port_config(pid, mask, dir, type, pol, debounce, data);
-}
-
-
-/****************************************************************************************/
-/* Returns the configuration parameters of a given GPIO bit.                            */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_bitconfig_get(ALT_GPIO_1BIT_t signal_num,
-        ALT_GPIO_CONFIG_RECORD_t *config)
-{
-    ALT_STATUS_CODE     ret = ALT_E_ERROR;
-    ALT_GPIO_PORT_t     pid;
-    uint32_t            mask, shift;
-
-    if ((config != NULL) && (signal_num != ALT_END_OF_GPIO_SIGNALS) && (signal_num <= ALT_LAST_VALID_GPIO_BIT))
-    {
-        pid = alt_gpio_bit_to_pid(signal_num);
-        shift = alt_gpio_bit_to_port_pin(signal_num);
-        if ((pid != ALT_GPIO_PORT_UNKNOWN) && (shift <= ALT_GPIO_BIT_MAX))
-        {
-            config->signal_number = signal_num;
-            mask = 0x00000001 << shift;
-            config->direction = (alt_gpio_port_datadir_get(pid, mask) == 0) ? ALT_GPIO_PIN_INPUT : ALT_GPIO_PIN_OUTPUT;
-            config->type = (alt_gpio_port_int_type_get(pid, mask) == 0) ? ALT_GPIO_PIN_LEVEL_TRIG_INT : ALT_GPIO_PIN_EDGE_TRIG_INT;
-
-            // save the following data whatever the state of config->direction
-            config->polarity = (alt_gpio_port_int_pol_get(pid, mask) == 0) ? ALT_GPIO_PIN_ACTIVE_LOW : ALT_GPIO_PIN_ACTIVE_HIGH;
-            config->debounce = (alt_gpio_port_debounce_get(pid, mask) == 0) ? ALT_GPIO_PIN_NODEBOUNCE : ALT_GPIO_PIN_DEBOUNCE;
-            config->data = (alt_gpio_port_data_read(pid, mask) == 0) ? ALT_GPIO_PIN_DATAZERO : ALT_GPIO_PIN_DATAONE;
-            ret = ALT_E_SUCCESS;
-        }
-    }
-    return ret;
-}
-
-
-/****************************************************************************************/
-/* alt_gpio_group_config() configures a list of GPIO bits. The GPIO bits do not have    */
-/* to be configured the same, as was the case for the mask version of this function,    */
-/* alt_gpio_port_config(). Each bit may be configured differently and bits may be       */
-/* listed in any order.                                                                 */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_group_config(ALT_GPIO_CONFIG_RECORD_t* config_array, uint32_t len)
-{
-    ALT_STATUS_CODE         ret = ALT_E_ERROR;
-
-    if (config_array != NULL)
-    {
-        if (config_array->signal_number == ALT_END_OF_GPIO_SIGNALS) { ret = ALT_E_SUCCESS; }
-            // catches the condition where the pointers are good, but the
-            // first index is the escape character - which isn't an error
-        else
-        {
-            for (; (len-- > 0) && (config_array->signal_number != ALT_END_OF_GPIO_SIGNALS) && (config_array != NULL); config_array++)
-            {
-                ret = alt_gpio_bit_config(config_array->signal_number,
-                        config_array->direction, config_array->type, config_array->polarity,
-                        config_array->debounce, config_array->data);
-                if ((config_array->direction == ALT_GPIO_PIN_OUTPUT) && (ret == ALT_E_SUCCESS))
-                {
-                    // if the pin is set to be an output, set it to the correct value
-                    alt_gpio_port_data_write(alt_gpio_bit_to_pid(config_array->signal_number),
-                             0x1 << alt_gpio_bit_to_port_pin(config_array->signal_number),
-                             ALT_GPIO_ALLORNONE(config_array->data));
-                        // ret should retain the value returned by alt_gpio_bit_config() above
-                        // and should not be changed by the alt_gpio_port_data_write() call.
-                }
-                if (((ret != ALT_E_SUCCESS) && (config_array->signal_number <= ALT_LAST_VALID_GPIO_BIT))
-                    || ((ret == ALT_E_SUCCESS) && (config_array->signal_number > ALT_LAST_VALID_GPIO_BIT)))
-                {
-                    ret = ALT_E_ERROR;
-                    break;
-                }
-            }
-        }
-    }
-    return ret;
-}
-
-
-/****************************************************************************************/
-/* Returns a list of the pin signal indices and the associated configuration settings   */
-/* (data direction, interrupt type, polarity, debounce, and synchronization) of that    */
-/* list of signals. Only the signal indices in the first field of each configuration    */
-/* record need be filled in. This function will fill in all the other fields of the     */
-/* configuration record, returning all configuration parameters in the array. A signal  */
-/* number index in the array equal to ALT_END_OF_GPIO_SIGNALS (-1) also terminates the  */
-/* function.                                                                            */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_group_config_get(ALT_GPIO_CONFIG_RECORD_t *config_array,
-        uint32_t len)
-{
-    ALT_STATUS_CODE     ret = ALT_E_ERROR;
-
-    if ((config_array != NULL) && (config_array->signal_number == ALT_END_OF_GPIO_SIGNALS))
-    {
-        ret = ALT_E_SUCCESS;
-    }
-    else
-    {
-        for ( ; (len > 0) && (config_array != NULL) && (config_array->signal_number != ALT_END_OF_GPIO_SIGNALS)
-                    && (config_array->signal_number <= ALT_LAST_VALID_GPIO_BIT); len--)
-        {
-            ret = alt_gpio_bitconfig_get(config_array->signal_number, config_array);
-            config_array++;
-            if (ret != ALT_E_SUCCESS) { break; }
-        }
-    }
-    return ret;
-}
-
-/****************************************************************************************/
-/* Another way to return a configuration list. The difference between this version and  */
-/* alt_gpio_group_config_get() is that this version follows a separate list of signal   */
-/* indices instead of having the signal list provided in the first field of the         */
-/* configuration records in the array. This function will fill in the fields of the     */
-/* configuration record, returning all configuration parameters in the array. A signal  */
-/* number index in the array equal to ALT_END_OF_GPIO_SIGNALS (-1) also terminates      */
-/* operation.                                                                           */
-/****************************************************************************************/
-
-ALT_STATUS_CODE alt_gpio_group_config_get2(ALT_GPIO_1BIT_t* pinid_array,
-        ALT_GPIO_CONFIG_RECORD_t *config_array, uint32_t len)
-{
-    ALT_STATUS_CODE     ret = ALT_E_ERROR;
-
-    if ((config_array != NULL) && (pinid_array != NULL) && (*pinid_array == ALT_END_OF_GPIO_SIGNALS))
-    {
-        ret = ALT_E_SUCCESS;
-        // catches the condition where the pointers are good, but the
-        // first index is the escape character - which isn't an error
-    }
-    else
-    {
-        for ( ;(len > 0) && (pinid_array != NULL) && (*pinid_array != ALT_END_OF_GPIO_SIGNALS) && (config_array != NULL); len--)
-        {
-            ret = alt_gpio_bitconfig_get(*pinid_array, config_array);
-            config_array++;
-            pinid_array++;
-            if (ret != ALT_E_SUCCESS) { break; }
-        }
-    }
-    return ret;
-}
-
-
-/****************************************************************************************/
-/* A useful utility function. Extracts the GPIO port ID from the supplied GPIO Signal   */
-/* Index Number.                                                                        */
-/****************************************************************************************/
-
-ALT_GPIO_PORT_t alt_gpio_bit_to_pid(ALT_GPIO_1BIT_t pin_num)
-{
-    ALT_GPIO_PORT_t     pid = ALT_GPIO_PORT_UNKNOWN;
-
-    if (pin_num <= ALT_GPIO_EOPA) { pid = ALT_GPIO_PORTA; }
-    else if (pin_num <= ALT_GPIO_EOPB) { pid = ALT_GPIO_PORTB; }
-    else if (pin_num <= ALT_GPIO_EOPC) { pid = ALT_GPIO_PORTC; }
-    return pid;
-}
-
-
-/****************************************************************************************/
-/* A useful utility function. Extracts the GPIO signal (pin) mask from the supplied     */
-/* GPIO Signal Index Number.                                                           */
-/****************************************************************************************/
-
-ALT_GPIO_PORTBIT_t alt_gpio_bit_to_port_pin(ALT_GPIO_1BIT_t pin_num)
-{
-    if (pin_num <= ALT_GPIO_EOPA) {}
-    else if (pin_num <= ALT_GPIO_EOPB) { pin_num -= (ALT_GPIO_EOPA + 1); }
-    else if (pin_num <= ALT_GPIO_EOPC) { pin_num -= (ALT_GPIO_EOPB + 1); }
-    else { return ALT_END_OF_GPIO_PORT_SIGNALS; }
-    return (ALT_GPIO_PORTBIT_t) pin_num;
-}
-
-
-/****************************************************************************************/
-/* A useful utility function. Extracts the GPIO Signal Index Number from the supplied   */
-/* GPIO port ID and signal mask. If passed a bitmask composed of more than one signal,  */
-/* the signal number of the lowest bitmask presented is returned.                       */
-/****************************************************************************************/
-
-ALT_GPIO_1BIT_t alt_gpio_port_pin_to_bit(ALT_GPIO_PORT_t pid,
-        uint32_t bitmask)
-{
-    uint32_t    i;
-
-    for (i=0; i <= ALT_GPIO_BITNUM_MAX ;i++)
-    {
-        if (bitmask & 0x00000001)
-        {
-            if (pid == ALT_GPIO_PORTA) {}
-            else if (pid == ALT_GPIO_PORTB) { i += ALT_GPIO_EOPA + 1; }
-            else if (pid == ALT_GPIO_PORTC) { i += ALT_GPIO_EOPB + 1; }
-            else { return ALT_END_OF_GPIO_SIGNALS; }
-            return (ALT_GPIO_1BIT_t) i;
-        }
-        bitmask >>= 1;
-    }
-    return ALT_END_OF_GPIO_SIGNALS;
-}
-

bsps/arm/altera-cyclone-v/contrib/hwlib/src/hwmgr/alt_reset_manager.c

@@ -1,141 +0,0 @@
-/**
- * @file
- *
- * @ingroup RTEMSBSPsARMCycVContrib
- */
-
-
-/******************************************************************************
-*
-* alt_reset_manager.c - API for the Altera SoC FPGA reset manager.
-*
-******************************************************************************/
-
-/******************************************************************************
-*
-* Copyright 2013 Altera Corporation. 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. The name of the author may not be used to endorse or promote products
-* derived from this software without specific prior written permission.
-* 
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "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 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.
-* 
-******************************************************************************/
-
-#include <bsp/alt_reset_manager.h>
-#include <bsp/socal/socal.h>
-#include <bsp/socal/hps.h>
-#include <bsp/socal/alt_rstmgr.h>
-
-/////
-
-
-uint32_t alt_reset_event_get(void)
-{
-    return alt_read_word(ALT_RSTMGR_STAT_ADDR);
-}
-
-ALT_STATUS_CODE alt_reset_event_clear(uint32_t event_mask)
-{
-    alt_write_word(ALT_RSTMGR_STAT_ADDR, event_mask);
-    return ALT_E_SUCCESS;
-}
-
-ALT_STATUS_CODE alt_reset_cold_reset(void)
-{
-    alt_write_word(ALT_RSTMGR_CTL_ADDR, ALT_RSTMGR_CTL_SWCOLDRSTREQ_SET_MSK);
-    return ALT_E_SUCCESS;
-}
-
-ALT_STATUS_CODE alt_reset_warm_reset(uint32_t warm_reset_delay,
-                                     uint32_t nRST_pin_clk_assertion,
-                                     bool sdram_refresh_enable,
-                                     bool fpga_mgr_handshake,
-                                     bool scan_mgr_handshake,
-                                     bool fpga_handshake,
-                                     bool etr_stall)
-{
-    // Cached register values
-    uint32_t ctrl_reg   = ALT_RSTMGR_CTL_SWWARMRSTREQ_SET_MSK;
-    uint32_t counts_reg = 0;
-
-    /////
-
-    // Validate warm_reset_delay is above 16 and below the field width
-    if ((warm_reset_delay < 16) || (warm_reset_delay >= (1 << ALT_RSTMGR_COUNTS_WARMRSTCYCLES_WIDTH)))
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    // Validate nRST_pin_clk_assertion delay is non-zero and below the field width
-    if (!nRST_pin_clk_assertion)
-    {
-        return ALT_E_ERROR;
-    }
-    if (nRST_pin_clk_assertion >= (1 << ALT_RSTMGR_COUNTS_NRSTCNT_WIDTH))
-    {
-        return ALT_E_BAD_ARG;
-    }
-
-    // Update counts register with warm_reset_delay information
-    counts_reg |= ALT_RSTMGR_COUNTS_WARMRSTCYCLES_SET(warm_reset_delay);
-
-    // Update counts register with nRST_pin_clk_assertion information
-    counts_reg |= ALT_RSTMGR_COUNTS_NRSTCNT_SET(nRST_pin_clk_assertion);
-
-    /////
-
-    // Update ctrl register with the specified option flags
-
-    if (sdram_refresh_enable)
-    {
-        ctrl_reg |= ALT_RSTMGR_CTL_SDRSELFREFEN_SET_MSK;
-    }
-
-    if (fpga_mgr_handshake)
-    {
-        ctrl_reg |= ALT_RSTMGR_CTL_FPGAMGRHSEN_SET_MSK;
-    }
-
-    if (scan_mgr_handshake)
-    {
-        ctrl_reg |= ALT_RSTMGR_CTL_SCANMGRHSEN_SET_MSK;
-    }
-
-    if (fpga_handshake)
-    {
-        ctrl_reg |= ALT_RSTMGR_CTL_FPGAHSEN_SET_MSK;
-    }
-
-    if (etr_stall)
-    {
-        ctrl_reg |= ALT_RSTMGR_CTL_ETRSTALLEN_SET_MSK;
-    }
-
-    /////
-
-    // Commit registers to hardware
-    alt_write_word(ALT_RSTMGR_COUNTS_ADDR, counts_reg);
-    alt_write_word(ALT_RSTMGR_CTL_ADDR,    ctrl_reg);
-
-    return ALT_E_SUCCESS;
-}

bsps/arm/altera-cyclone-v/headers.am

@@ -1,45 +0,0 @@
-## This file was generated by "./boostrap -H".
-
-include_HEADERS =
-include_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp.h
-include_HEADERS += include/bspopts.h
-include_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/tm27.h
-
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_16550_uart.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_address_space.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_cache.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_clock_group.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_clock_manager.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma_common.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma_program.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_generalpurpose_io.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_hwlibs_ver.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_i2c.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_interrupt_common.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_mpu_registers.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_qspi_private.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_reset_manager.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/hwlib.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/i2cdrv.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/irq.h
-
-include_bsp_socaldir = $(includedir)/bsp/socal
-include_bsp_socal_HEADERS =
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_acpidmap.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_clkmgr.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmanonsecure.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmasecure.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_gpio.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_i2c.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_l3.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspi.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspidata.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_rstmgr.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sdr.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sysmgr.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_uart.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/hps.h
-include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/socal.h

bsps/arm/altera-cyclone-v/i2c/i2cdrv-config.c

@@ -1,30 +0,0 @@
-/**
- * @file
- *
- * @ingroup RTEMSBSPsARMCycVI2C
- */
-
-/*
- * Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info@embedded-brains.de>
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#include <bsp.h>
-#include "i2cdrv-config.h"
-
-const i2cdrv_configuration i2cdrv_config[CYCLONE_V_NO_I2C] = {
-  {
-    .controller = ALT_I2C_I2C0,
-    .device_name = "/dev/i2c0",
-    .speed = CYCLONE_V_I2C0_SPEED,
-  }
-};

bsps/arm/altera-cyclone-v/i2c/i2cdrv-config.h

@@ -1,43 +0,0 @@
-/**
- * @file
- *
- * @ingroup RTEMSBSPsARMCycVI2C
- */
-
-/*
- * Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info@embedded-brains.de>
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef XXX_H
-#define XXX_H
-
-#include <rtems.h>
-#include <bsp/alt_i2c.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct {
-  ALT_I2C_CTLR_t controller;
-  char *device_name;
-  uint32_t speed;
-} i2cdrv_configuration;
-
-extern const i2cdrv_configuration i2cdrv_config[];
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* XXX_H */