diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f58ffc2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ + +*.h linguist-language=C diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 5867c1e..e3f77f9 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -1,28 +1,20 @@ { - "env": { - "loaderDefaultIncludePaths": [ - "${workspaceFolder}/include", - "${workspaceFolder}/scripts/opt/cross/lib/gcc/arm-none-eabi/8.2.0/include", - "${workspaceFolder}/scripts/opt/cross/lib/gcc/aarch64-none-elf/8.2.0/include" - ], - "loaderDefaultBrowsePaths": [ - "${workspaceFolder}/src", - "${workspaceFolder}/include", - "${workspaceFolder}/scripts/opt/cross/lib/gcc/arm-none-eabi/8.2.0/include", - "${workspaceFolder}/scripts/opt/cross/lib/gcc/aarch64-none-elf/8.2.0/include" - ] - }, "configurations": [ { "name": "Mac", "includePath": [ - "${loaderDefaultIncludePaths}" + "${workspaceFolder}/include", + "${env:HOME}/.bolthur/cross/lib/gcc/arm-none-eabi/9.1.0/include", + "${env:HOME}/.bolthur/cross/lib/gcc/aarch64-none-elf/9.1.0/include" ], "defines": [], "intelliSenseMode": "${default}", "browse": { "path": [ - "${loaderDefaultBrowsePaths}" + "${workspaceFolder}/src", + "${workspaceFolder}/include", + "${env:HOME}/.bolthur/cross/lib/gcc/arm-none-eabi/9.1.0/include", + "${env:HOME}/.bolthur/cross/lib/gcc/aarch64-none-elf/9.1.0/include" ], "limitSymbolsToIncludedHeaders": true, "databaseFilename": "" @@ -36,35 +28,18 @@ { "name": "Linux", "includePath": [ - "${loaderDefaultIncludePaths}" + "${workspaceFolder}/include", + "${env:HOME}/.bolthur/cross/lib/gcc/arm-none-eabi/9.1.0/include", + "${env:HOME}/.bolthur/cross/lib/gcc/aarch64-none-elf/9.1.0/include" ], "defines": [], "intelliSenseMode": "${default}", "browse": { "path": [ - "${loaderDefaultBrowsePaths}" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "" - }, - "forcedInclude": [ - "${workspaceFolder}/build/include/config.h" - ], - "cStandard": "c11" - }, - { - "name": "Win32", - "includePath": [ - "${loaderDefaultIncludePaths}" - ], - "defines": [ - "_DEBUG", - "UNICODE" - ], - "intelliSenseMode": "${default}", - "browse": { - "path": [ - "${loaderDefaultBrowsePaths}" + "${workspaceFolder}/src", + "${workspaceFolder}/include", + "${env:HOME}/.bolthur/cross/lib/gcc/arm-none-eabi/9.1.0/include", + "${env:HOME}/.bolthur/cross/lib/gcc/aarch64-none-elf/9.1.0/include" ], "limitSymbolsToIncludedHeaders": true, "databaseFilename": "" diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..31e71d0 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,36 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "aarch32-rpi-qemu-debug", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/src/platform/rpi/loader7.sym", + "miDebuggerPath": "${env:HOME}/.bolthur/cross/bin/arm-none-eabi-gdb", + "miDebuggerArgs": "-q", + "MIMode": "gdb", + "cwd": "${workspaceFolder}/build/src/platform/rpi/", + "setupCommands": [ + { + "text": "-enable-pretty-printing", + "description": "Enable GDB pretty printing" + }, + { + "text": "set architecture armv7", + "description": "Set architecture" + }, + { + "text": "file ${workspaceFolder}/build/src/platform/rpi/loader7.sym", + "description": "Loading symbol file" + }, + { + "text": "target remote | qemu-system-arm -M raspi2 -cpu cortex-a7 -no-reboot -serial pty -kernel ${workspaceFolder}/build/src/platform/rpi/loader.elf -gdb stdio -S", + "description": "Set target to remote with qemu" + } + ], + "externalConsole": false, + "launchCompleteCommand": "None", + "preLaunchTask": "compile" + } + ] +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..4c7862f --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,44 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "clean", + "type": "shell", + "command": "make", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "args": [ + "clean" + ], + "group": { + "kind": "build", + "isDefault": true + }, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + } + }, + { + "label": "compile", + "type": "shell", + "command": "make", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "group": { + "kind": "build", + "isDefault": true + }, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + } + } + ] +} diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..9d0be58 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +Authors of bolthur-serial-loader + +Christian Freitag cfreitag.cf@googlemail.com diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + 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 +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 3 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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program 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, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU 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. But first, please read +. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..3fb2332 --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +xxxx-xx-xx Christian Freitag diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.am b/Makefile.am index dc07c72..7205eb3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I build-aux/m4 SUBDIRS = src diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..a17eb9f --- /dev/null +++ b/NEWS @@ -0,0 +1 @@ +NEWS - List of noteworthy changes between releases of bolthur-serial-loader diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/README.md b/README.md index f556978..ca17aee 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # bolthur serial loader [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](./LICENSE) [![Code of Conduct](https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat)](./.github/CODE_OF_CONDUCT.md) [![Contribution Guide](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](./.github/CONTRIBUTING.md) ![version](https://img.shields.io/badge/version-none-blue.svg?maxAge=2592000) bolthur serial communicator project. -_Copyright (C) 2019 bolthur project_ +_Copyright (C) 2019 - 2020 bolthur project_ ## About diff --git a/build-aux/m4/device.m4 b/build-aux/m4/device.m4 new file mode 100644 index 0000000..26b03a2 --- /dev/null +++ b/build-aux/m4/device.m4 @@ -0,0 +1,18 @@ + +AC_DEFUN([BOLTHUR_SERIAL_LOADER_SET_DEVICE], [ + # set device depending on arguments + case "${enable_device}" in + rpi2_b_rev1) + DEVICE="rpi2_b_rev1" + ;; + rpi3_b) + DEVICE="rpi3_b" + ;; + rpi_zero_w) + DEVICE="rpi_zero_w" + ;; + *) + AC_MSG_ERROR([Unknown target device]) + ;; + esac +]) diff --git a/build-aux/m4/flag.m4 b/build-aux/m4/flag.m4 new file mode 100644 index 0000000..390c2a8 --- /dev/null +++ b/build-aux/m4/flag.m4 @@ -0,0 +1,39 @@ + +AC_DEFUN([BOLTHUR_SERIAL_LOADER_SET_FLAG], [ + # warnings + CFLAGS="${CFLAGS} -Wall -Wextra -Werror -Wpedantic -Wconversion -Wpacked" + CFLAGS="${CFLAGS} -Wpacked-bitfield-compat -Wpacked-not-aligned" + # generic + CFLAGS="${CFLAGS} -ffreestanding -fno-exceptions -nodefaultlibs -std=c18" + + # debug parameter + AS_IF([test "x$with_debug" == "xyes"], [ + CFLAGS="${CFLAGS} -g" + ]) + # optimization level + case "${with_opt}" in + no | 0) + CFLAGS="${CFLAGS} -O0" + ;; + 1) + CFLAGS="${CFLAGS} -O1" + ;; + 2) + CFLAGS="${CFLAGS} -O2" + ;; + 3) + CFLAGS="${CFLAGS} -O3" + ;; + s) + CFLAGS="${CFLAGS} -Os" + ;; + g) + CFLAGS="${CFLAGS} -Og" + ;; + *) + CFLAGS="${CFLAGS} -O2" + ;; + esac + + LDFLAGS="${LDFLAGS} -nostdlib" +]) diff --git a/m4/host.m4 b/build-aux/m4/host.m4 similarity index 79% rename from m4/host.m4 rename to build-aux/m4/host.m4 index 0cd3a70..5e88c1e 100644 --- a/m4/host.m4 +++ b/build-aux/m4/host.m4 @@ -3,6 +3,7 @@ AC_DEFUN([BOLTHUR_SERIAL_LOADER_SET_HOST], [ AH_TEMPLATE([ELF32], [Define to 1 for 32 bit ELF targets]) AH_TEMPLATE([ELF64], [Define to 1 for 64 bit ELF targets]) AH_TEMPLATE([SOC_LOAD_ADDRESS], [Define containing soc load address]) + AH_TEMPLATE([INITRD_LOAD_ADDRESS], [Define containing load address of initrd]) AH_TEMPLATE([FPU_AVAILABLE], [Define to 1 for available fpu]) AH_TEMPLATE([SMP_AVAILABLE], [Define to 1 for SMP systems]) @@ -19,35 +20,38 @@ AC_DEFUN([BOLTHUR_SERIAL_LOADER_SET_HOST], [ rpi2_b_rev1) CFLAGS="${CFLAGS} -march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv3 -mfloat-abi=hard" subarch_subdir=v7 - vendor_subdir=rpi + platform_subdir=rpi output_img=loader7.img output_sym=loader7.sym AC_DEFINE([BCM2709], [1], [Define to 1 for BCM2709 chip]) AC_DEFINE([SOC_LOAD_ADDRESS], [0x8000]) + AC_DEFINE([INITRD_LOAD_ADDRESS], [0x800000]) AC_DEFINE([FPU_AVAILABLE], [1]) AC_DEFINE([SMP_AVAILABLE], [1]) ;; rpi_zero_w) CFLAGS="${CFLAGS} -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfpv2 -mfloat-abi=hard" subarch_subdir=v6 - vendor_subdir=rpi + platform_subdir=rpi AC_DEFINE([BCM2708], [1], [Define to 1 for BCM2708 chip]) AC_DEFINE([SOC_LOAD_ADDRESS], [0x8000]) + AC_DEFINE([INITRD_LOAD_ADDRESS], [0x800000]) AC_DEFINE([FPU_AVAILABLE], [1]) ;; rpi3_b) CFLAGS="${CFLAGS} -march=armv8-a -mtune=cortex-a53 -mfpu=neon-vfpv4 -mfloat-abi=hard" subarch_subdir=v8 - vendor_subdir=rpi + platform_subdir=rpi output_img=loader8.img output_sym=loader8.sym AC_DEFINE([BCM2710], [1], [Define to 1 for BCM2710 chip]) - AC_DEFINE([SOC_LOAD_ADDRESS], [0x8000]) + AC_DEFINE([SOC_LOAD_ADDRESS], [0x80000]) + AC_DEFINE([INITRD_LOAD_ADDRESS], [0x800000]) AC_DEFINE([FPU_AVAILABLE], [1]) AC_DEFINE([SMP_AVAILABLE], [1]) ;; *) - AC_MSG_ERROR([unsupported host vendor]) + AC_MSG_ERROR([unsupported host platform]) ;; esac ;; @@ -61,15 +65,16 @@ AC_DEFUN([BOLTHUR_SERIAL_LOADER_SET_HOST], [ rpi3_b) CFLAGS="${CFLAGS} -march=armv8-a -mtune=cortex-a53" subarch_subdir=v8 - vendor_subdir=rpi + platform_subdir=rpi output_img=loader8.img output_sym=loader8.sym AC_DEFINE([BCM2710], [1], [Define to 1 for BCM2710 chip]) AC_DEFINE([SOC_LOAD_ADDRESS], [0x80000]) + AC_DEFINE([INITRD_LOAD_ADDRESS], [0x800000]) AC_DEFINE([FPU_AVAILABLE], [1]) ;; *) - AC_MSG_ERROR([unsupported host vendor]) + AC_MSG_ERROR([unsupported host platform]) ;; esac ;; @@ -82,10 +87,10 @@ AC_DEFUN([BOLTHUR_SERIAL_LOADER_SET_HOST], [ AC_DEFINE_UNQUOTED([ARCH], [${arch_subdir}], [bolthur/serial-loader target architecture]) AC_DEFINE_UNQUOTED([SUBARCH], [${subarch_subdir}], [bolthur/serial-loader target subarchitecture]) - AC_DEFINE_UNQUOTED([VENDOR], [${vendor_subdir}], [bolthur/serial-loader target vendor]) + AC_DEFINE_UNQUOTED([PLATFORM], [${platform_subdir}], [bolthur/serial-loader target platform]) AC_SUBST(arch_subdir) AC_SUBST(subarch_subdir) - AC_SUBST(vendor_subdir) + AC_SUBST(platform_subdir) AC_SUBST(output_img) AC_SUBST(output_sym) AC_SUBST(host_bfd) diff --git a/m4/objcopy.m4 b/build-aux/m4/objcopy.m4 similarity index 100% rename from m4/objcopy.m4 rename to build-aux/m4/objcopy.m4 diff --git a/configure.ac b/configure.ac index 7d75a1b..c1cec20 100644 --- a/configure.ac +++ b/configure.ac @@ -1,72 +1,54 @@ AC_PREREQ(2.57) AC_INIT([bolthur-serial-loader], [0.1], [https://github.com/bolthur/serial-loader/issues], [bolthur-serial-loader], [https://github.com/bolthur/serial-loader]) -AC_COPYRIGHT([Copyright (C) 2019 bolthur project]) +AC_COPYRIGHT([Copyright (C) 2019 - 2020 bolthur project]) -AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_MACRO_DIR([m4]) +# Add hosted toolchain to path +AC_SUBST(PATH, "/opt/bolthur/cross/bin:${PATH}") + +AC_CONFIG_AUX_DIR([build-aux/config]) +AC_CONFIG_MACRO_DIR([build-aux/m4]) AC_CANONICAL_HOST AC_CONFIG_SRCDIR([src/loader/main.c]) -AM_INIT_AUTOMAKE([foreign 1.7]) +AM_INIT_AUTOMAKE() AC_CONFIG_HEADERS([include/config.h]) -AM_SILENT_RULES([yes]) - AC_LANG([C]) -# FIXME: Shouldn't be necessary, when creating symlinks of toolchain binaries to /usr/local/bin -AC_SUBST(PATH, "${HOME}/.bolthur/cross/bin:${PATH}") - AC_ARG_ENABLE([device], - AC_HELP_STRING([--enable-device], [set target device (default and fallback is rpi2_b_rev1)]), - [case "${enableval}" in - rpi2_b_rev1) - DEVICE="rpi2_b_rev1" - ;; - rpi3_b) - DEVICE="rpi3_b" - ;; - rpi_zero_w) - DEVICE="rpi_zero_w" - ;; - esac], - [DEVICE="rpi2_b_rev1"] + AC_HELP_STRING( + [--enable-device], + [set target device to compile for [possible targets: rpi2_b_rev1]] + ), + [enable_device=$enableval], + [AC_MSG_ERROR([Target device missing])] +) + +AC_ARG_WITH( + [debug], + AC_HELP_STRING( + [--with-debug], + [compile with debug symbols] + ), + [with_debug=yes] ) -AC_ARG_ENABLE([opt], - AC_HELP_STRING([--enable-opt], [enable code optimization (default: 2)]), - [case "${enableval}" in - no | 0) - CFLAGS="${CFLAGS} -O0" - ;; - 1) - CFLAGS="${CFLAGS} -O1" - ;; - 2) - CFLAGS="${CFLAGS} -O2" - ;; - 3) - CFLAGS="${CFLAGS} -O3" - ;; - s) - CFLAGS="${CFLAGS} -Os" - ;; - g) - CFLAGS="${CFLAGS} -Og" - ;; - *) - CFLAGS="${CFLAGS} -O2" - ;; - esac], - [CFLAGS="${CFLAGS} -O2"] +AC_ARG_WITH( + [opt], + AC_HELP_STRING( + [--with-opt], + [compile with specific code optimization level [possible values: 0, 1, 2, 3, s, g | default: 2]] + ), + [with_opt=$withval] ) # set target and flags +BOLTHUR_SERIAL_LOADER_SET_DEVICE BOLTHUR_SERIAL_LOADER_SET_HOST # set normal flags -BOLTHUR_SERIAL_LOADER_SET_FLAGS +BOLTHUR_SERIAL_LOADER_SET_FLAG # conftest AC_LANG_CONFTEST([AC_LANG_SOURCE([[const char hw[] = "Hello, World\r\n";]])]) @@ -101,8 +83,8 @@ AC_CONFIG_FILES([ src/arch/arm/v6/Makefile src/arch/arm/v7/Makefile src/arch/arm/v8/Makefile - src/vendor/Makefile - src/vendor/rpi/Makefile + src/platform/Makefile + src/platform/rpi/Makefile ]) AC_OUTPUT diff --git a/include/arch/arm/delay.h b/include/arch/arm/delay.h index 3355b67..0d455ca 100644 --- a/include/arch/arm/delay.h +++ b/include/arch/arm/delay.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/arch/arm/mmio.h b/include/arch/arm/mmio.h index 36b1ca7..b9cf010 100644 --- a/include/arch/arm/mmio.h +++ b/include/arch/arm/mmio.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/arch/arm/relocate.32.S b/include/arch/arm/relocate.32.S index 7393607..b2374b2 100644 --- a/include/arch/arm/relocate.32.S +++ b/include/arch/arm/relocate.32.S @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/arch/arm/relocate.64.S b/include/arch/arm/relocate.64.S index c8527c4..dc650c0 100644 --- a/include/arch/arm/relocate.64.S +++ b/include/arch/arm/relocate.64.S @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/loader/entry.h b/include/loader/entry.h index a186dce..86d8c95 100644 --- a/include/loader/entry.h +++ b/include/loader/entry.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -23,6 +23,9 @@ #include +#define FILE_TYPE_KERNEL 1 +#define FILE_TYPE_INITRD 2 + extern uint32_t __loader_start; extern uint32_t __loader_end; diff --git a/include/loader/itoa.h b/include/loader/itoa.h index 70c0a3e..ff034ee 100644 --- a/include/loader/itoa.h +++ b/include/loader/itoa.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/loader/memcpy.h b/include/loader/memcpy.h index ea34400..aeceeb5 100644 --- a/include/loader/memcpy.h +++ b/include/loader/memcpy.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/loader/vendor.h b/include/loader/platform.h similarity index 84% rename from include/loader/vendor.h rename to include/loader/platform.h index a192c63..c3f3932 100644 --- a/include/loader/vendor.h +++ b/include/loader/platform.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -18,9 +18,9 @@ * along with bolthur/serial-loader. If not, see . */ -#if !defined( VENDOR_H ) -#define VENDOR_H +#if !defined( PLATFORM_H ) +#define PLATFORM_H -extern void vendor_boot_kernel( void ); +extern void platform_boot_kernel( void ); #endif diff --git a/include/loader/printf.h b/include/loader/printf.h index b807aa1..a39c9c3 100644 --- a/include/loader/printf.h +++ b/include/loader/printf.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/loader/serial.h b/include/loader/serial.h index 95bd2bf..9cf2790 100644 --- a/include/loader/serial.h +++ b/include/loader/serial.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/loader/strlen.h b/include/loader/strlen.h index c534868..9ff961b 100644 --- a/include/loader/strlen.h +++ b/include/loader/strlen.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/loader/strncmp.h b/include/loader/strncmp.h new file mode 100644 index 0000000..fddd645 --- /dev/null +++ b/include/loader/strncmp.h @@ -0,0 +1,28 @@ + +/** + * Copyright (C) 2019 - 2020 bolthur project. + * + * This file is part of bolthur/serial-loader. + * + * bolthur/serial-loader 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 3 of the License, or + * (at your option) any later version. + * + * bolthur/serial-loader 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 bolthur/serial-loader. If not, see . + */ + +#if !defined( STRNCMP_H ) +#define STRNCMP_H + +#include + +int strncmp( const char*, const char*, size_t ); + +#endif diff --git a/include/loader/strrev.h b/include/loader/strrev.h index ca7134c..95f06c0 100644 --- a/include/loader/strrev.h +++ b/include/loader/strrev.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/loader/utoa.h b/include/loader/utoa.h index bb92522..9fc298d 100644 --- a/include/loader/utoa.h +++ b/include/loader/utoa.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/include/vendor/rpi/gpio.h b/include/platform/rpi/gpio.h similarity index 98% rename from include/vendor/rpi/gpio.h rename to include/platform/rpi/gpio.h index 96b79f0..012d9a9 100644 --- a/include/vendor/rpi/gpio.h +++ b/include/platform/rpi/gpio.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -20,8 +20,8 @@ #include -#if !defined( VENDOR_RPI_GPIO_H ) -#define VENDOR_RPI_GPIO_H +#if !defined( PLATFORM_RPI_GPIO_H ) +#define PLATFORM_RPI_GPIO_H enum { GPIO_BASE = 0x00200000, diff --git a/include/vendor/rpi/mailbox/mailbox.h b/include/platform/rpi/mailbox/mailbox.h similarity index 91% rename from include/vendor/rpi/mailbox/mailbox.h rename to include/platform/rpi/mailbox/mailbox.h index af110d6..6760ccf 100644 --- a/include/vendor/rpi/mailbox/mailbox.h +++ b/include/platform/rpi/mailbox/mailbox.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -20,8 +20,8 @@ #include -#if !defined( VENDOR_RPI_MAILBOX_MAILBOX_H ) -#define VENDOR_RPI_MAILBOX_MAILBOX_H +#if !defined( PLATFORM_RPI_MAILBOX_MAILBOX_H ) +#define PLATFORM_RPI_MAILBOX_MAILBOX_H #define MAILBOX_OFFSET 0xB880 #define MAILBOX_FULL 0x80000000 diff --git a/include/vendor/rpi/mailbox/property.h b/include/platform/rpi/mailbox/property.h similarity index 96% rename from include/vendor/rpi/mailbox/property.h rename to include/platform/rpi/mailbox/property.h index 2a0648b..8bd64bd 100644 --- a/include/vendor/rpi/mailbox/property.h +++ b/include/platform/rpi/mailbox/property.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -20,8 +20,8 @@ #include -#if !defined( VENDOR_RPI_MAILBOX_PROPERTY_H ) -#define VENDOR_RPI_MAILBOX_PROPERTY_H +#if !defined( PLATFORM_RPI_MAILBOX_PROPERTY_H ) +#define PLATFORM_RPI_MAILBOX_PROPERTY_H typedef enum { // videocore diff --git a/include/vendor/rpi/peripheral.h b/include/platform/rpi/peripheral.h similarity index 88% rename from include/vendor/rpi/peripheral.h rename to include/platform/rpi/peripheral.h index c929b00..a767ec3 100644 --- a/include/vendor/rpi/peripheral.h +++ b/include/platform/rpi/peripheral.h @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -20,8 +20,8 @@ #include -#if !defined( VENDOR_RPI_PERIPHERAL_H ) -#define VENDOR_RPI_PERIPHERAL_H +#if !defined( PLATFORM_RPI_PERIPHERAL_H ) +#define PLATFORM_RPI_PERIPHERAL_H // initial setup of peripheral base #if defined( BCM2709 ) || defined( BCM2710 ) diff --git a/m4/flags.m4 b/m4/flags.m4 deleted file mode 100644 index b983f50..0000000 --- a/m4/flags.m4 +++ /dev/null @@ -1,5 +0,0 @@ - -AC_DEFUN([BOLTHUR_SERIAL_LOADER_SET_FLAGS], [ - CFLAGS="${CFLAGS} -ffreestanding -fno-exceptions -Wall -Wextra -Werror -Wpedantic -Wconversion -Wpacked -Wpacked-bitfield-compat -Wpacked-not-aligned -nodefaultlibs -std=c18" - LDFLAGS="${LDFLAGS} -nostdlib" -]) diff --git a/src/Makefile.am b/src/Makefile.am index cfcdefc..1653c52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,2 @@ -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = loader arch vendor +SUBDIRS = loader arch platform diff --git a/src/arch/arm/delay.c b/src/arch/arm/delay.c index d9b14c4..8155185 100644 --- a/src/arch/arm/delay.c +++ b/src/arch/arm/delay.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/arch/arm/fpu.S b/src/arch/arm/fpu.S index 24eb826..8266d51 100644 --- a/src/arch/arm/fpu.S +++ b/src/arch/arm/fpu.S @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/arch/arm/mmio.c b/src/arch/arm/mmio.c index bf0494e..71cd6bd 100644 --- a/src/arch/arm/mmio.c +++ b/src/arch/arm/mmio.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am index 84a64a6..e6163aa 100644 --- a/src/loader/Makefile.am +++ b/src/loader/Makefile.am @@ -13,5 +13,6 @@ libloader_a_SOURCES = \ memcpy.c \ printf.c \ strlen.c \ + strncmp.c \ strrev.c \ utoa.c diff --git a/src/loader/itoa.c b/src/loader/itoa.c index b43bba5..03342df 100644 --- a/src/loader/itoa.c +++ b/src/loader/itoa.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/loader/main.c b/src/loader/main.c index ac1c6ce..f342049 100644 --- a/src/loader/main.c +++ b/src/loader/main.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -23,7 +23,8 @@ #include "loader/serial.h" #include "loader/printf.h" -#include "loader/vendor.h" +#include "loader/strncmp.h" +#include "loader/platform.h" #include "loader/entry.h" extern void boot_start( void ); @@ -33,24 +34,63 @@ extern void boot_start( void ); */ void loader_main() { // local variables - uint32_t size, loader_end_address, load_size; + uint32_t size, loader_end_address, type; + bool processing = false; // setup serial connection serial_init(); // loop until kernel dropped in while ( true ) { - // some initial output - printf( - "%s\r\nfunction located at: 0x%08x\r\nkernel loaded to: 0x%08x\r\nboot_start: 0x%08x\r\n", - PACKAGE_STRING, loader_main, SOC_LOAD_ADDRESS, boot_start - ); + // handle only if not processing + if ( ! processing ) { + // some start output + printf( "%s\r\n", PACKAGE_STRING ); + printf( "loader main located at: 0x%08x\r\n", loader_main ); + printf( "initrd will be loaded to: 0x%08x\r\n", INITRD_LOAD_ADDRESS ); + printf( "kernel will be loaded to: 0x%08x\r\n", SOC_LOAD_ADDRESS ); + + // flush serial device + serial_flush(); + + // send end of text to signal wait for kernel + serial_puts( "\x03\x03\x03" ); + + // set processing flag + processing = true; + } + + // get type + uint16_t tmp_type = ( uint32_t )serial_getc(); + tmp_type |= ( uint16_t )( serial_getc() << 8 ); + + // check for go command + const char* check_go = ( const char* )&tmp_type; + if ( 0 == strncmp( check_go, "GO", 2 ) ) { + // boot loaded kernel + printf( "Trying to boot received kernel\r\n" ); + platform_boot_kernel(); + + // break out of loop + break; + } - // flush serial device - serial_flush(); + type = tmp_type; + type |= ( uint32_t )( serial_getc() << 16 ); + type |= ( uint32_t )( serial_getc() << 24 ); - // send end of text to signal wait for kernel - serial_puts( "\x03\x03\x03" ); + // check type + if ( + FILE_TYPE_INITRD != type + && FILE_TYPE_KERNEL != type + ) { + serial_puts( "ER" ); + processing = false; + continue; + } + + // send okay + serial_puts( "OK" ); // get kernel size in bytes size = ( uint32_t )serial_getc(); @@ -58,15 +98,16 @@ void loader_main() { size |= ( uint32_t )( serial_getc() << 16 ); size |= ( uint32_t )( serial_getc() << 24 ); - // store load size - load_size = size; - // calculate end address loader_end_address = SOC_LOAD_ADDRESS + size; + if ( type == FILE_TYPE_INITRD ) { + loader_end_address = INITRD_LOAD_ADDRESS + size; + } // check for possible overflow and skip rest if ( loader_end_address > ( uint32_t )&__loader_start ) { serial_puts( "ER" ); + processing = false; continue; } @@ -74,7 +115,10 @@ void loader_main() { serial_puts( "OK" ); // pointer to kernel at system load address - uint8_t *kernel = ( uint8_t* )SOC_LOAD_ADDRESS; + uint8_t *file = ( uint8_t* )SOC_LOAD_ADDRESS; + if ( type == FILE_TYPE_INITRD ) { + file = ( uint8_t* )INITRD_LOAD_ADDRESS; + } uint32_t count = 0; // loop until size is 0 @@ -85,15 +129,8 @@ void loader_main() { } // store current byte - *kernel++ = serial_getc(); + *file++ = serial_getc(); } - - // boot loaded kernel - printf( "Booting received kernel with size of %d bytes\r\n", load_size ); - vendor_boot_kernel(); - - // break out of loop - break; } // endless loop should not be reached diff --git a/src/loader/memcpy.c b/src/loader/memcpy.c index d5f417b..f8a5390 100644 --- a/src/loader/memcpy.c +++ b/src/loader/memcpy.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/loader/printf.c b/src/loader/printf.c index 6eb9f64..ba02e7b 100644 --- a/src/loader/printf.c +++ b/src/loader/printf.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/loader/strlen.c b/src/loader/strlen.c index 9ced3ef..e18ae8e 100644 --- a/src/loader/strlen.c +++ b/src/loader/strlen.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/loader/strncmp.c b/src/loader/strncmp.c new file mode 100644 index 0000000..222b31c --- /dev/null +++ b/src/loader/strncmp.c @@ -0,0 +1,37 @@ + +/** + * Copyright (C) 2019 - 2020 bolthur project. + * + * This file is part of bolthur/serial-loader. + * + * bolthur/serial-loader 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 3 of the License, or + * (at your option) any later version. + * + * bolthur/serial-loader 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 bolthur/serial-loader. If not, see . + */ + +#include +#include + +int strncmp( const char* a, const char* b, size_t max_length ) { + // loop until max length + for ( size_t x = 0; x < max_length; x++ ) { + if ( '\0' == a[ x ] && '\0' == b[ x ] ) { + return 0; + } else if ( a[ x ] < b[ x ] ) { + return -1; + } else if ( a[ x ] > b[ x ] ) { + return 1; + } + } + // equal + return 0; +} diff --git a/src/loader/strrev.c b/src/loader/strrev.c index 0e23949..440db88 100644 --- a/src/loader/strrev.c +++ b/src/loader/strrev.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/loader/utoa.c b/src/loader/utoa.c index 51508fc..78eafd1 100644 --- a/src/loader/utoa.c +++ b/src/loader/utoa.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am new file mode 100644 index 0000000..a01ac97 --- /dev/null +++ b/src/platform/Makefile.am @@ -0,0 +1,4 @@ + +SUBDIRS = ${platform_subdir} + +DIST_SUBDIRS = rpi diff --git a/src/vendor/rpi/Makefile.am b/src/platform/rpi/Makefile.am similarity index 54% rename from src/vendor/rpi/Makefile.am rename to src/platform/rpi/Makefile.am index 00fbd18..3b37d58 100644 --- a/src/vendor/rpi/Makefile.am +++ b/src/platform/rpi/Makefile.am @@ -13,7 +13,7 @@ librpi_a_SOURCES = \ mailbox/property.c \ serial.c \ start.$(executable_format).S \ - vendor.c + platform.c # built sources determining things to be built first BUILT_SOURCES = \ @@ -21,42 +21,42 @@ BUILT_SOURCES = \ ${top_builddir}/src/arch/${arch_subdir}/${subarch_subdir}/lib$(subarch_subdir).a \ ${top_builddir}/src/arch/${arch_subdir}/lib$(arch_subdir).a \ ${top_builddir}/src/loader/libloader.a \ - loader.zwerg + loader.elf # no installable programs -noinst_PROGRAMS = loader.zwerg ${output_img} +noinst_PROGRAMS = loader.elf ${output_img} # Normal loader building for physical device -loader_zwerg_SOURCES = -loader_zwerg_DEPENDENCIES = \ +loader_elf_SOURCES = +loader_elf_DEPENDENCIES = \ loader.$(subarch_subdir).$(executable_format).ld \ librpi.a \ ${top_builddir}/src/arch/${arch_subdir}/${subarch_subdir}/lib$(subarch_subdir).a \ ${top_builddir}/src/arch/${arch_subdir}/lib$(arch_subdir).a \ ${top_builddir}/src/loader/libloader.a -loader_zwerg_LDFLAGS = \ - -T $(top_srcdir)/src/vendor/rpi/loader.$(subarch_subdir).$(executable_format).ld \ +loader_elf_LDFLAGS = \ + -T $(top_srcdir)/src/platform/rpi/loader.$(subarch_subdir).$(executable_format).ld \ -Wl,-Map,loader.map \ -Wl,-u,Entry EXTRA_PROGRAMS = loader.img loader7.img loader8.img -loader_img_DEPENDENCIES = loader.zwerg +loader_img_DEPENDENCIES = loader.elf loader_img_SOURCES = -loader.img$(EXEEXT): ${top_builddir}/src/vendor/rpi/loader.zwerg - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --only-keep-debug ${top_builddir}/src/vendor/rpi/loader.zwerg ${top_builddir}/src/vendor/rpi/${output_sym} - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --strip-debug ${top_builddir}/src/vendor/rpi/loader.zwerg - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) ${top_builddir}/src/vendor/rpi/loader.zwerg -O binary ${top_builddir}/src/vendor/rpi/${output_img} +loader.img$(EXEEXT): ${top_builddir}/src/platform/rpi/loader.elf + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --only-keep-debug ${top_builddir}/src/platform/rpi/loader.elf ${top_builddir}/src/platform/rpi/${output_sym} + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --strip-debug ${top_builddir}/src/platform/rpi/loader.elf + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) ${top_builddir}/src/platform/rpi/loader.elf -O binary ${top_builddir}/src/platform/rpi/${output_img} -loader7_img_DEPENDENCIES = loader.zwerg +loader7_img_DEPENDENCIES = loader.elf loader7_img_SOURCES = -loader7.img$(EXEEXT): ${top_builddir}/src/vendor/rpi/loader.zwerg - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --only-keep-debug ${top_builddir}/src/vendor/rpi/loader.zwerg ${top_builddir}/src/vendor/rpi/${output_sym} - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --strip-debug ${top_builddir}/src/vendor/rpi/loader.zwerg - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) ${top_builddir}/src/vendor/rpi/loader.zwerg -O binary ${top_builddir}/src/vendor/rpi/${output_img} +loader7.img$(EXEEXT): ${top_builddir}/src/platform/rpi/loader.elf + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --only-keep-debug ${top_builddir}/src/platform/rpi/loader.elf ${top_builddir}/src/platform/rpi/${output_sym} + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --strip-debug ${top_builddir}/src/platform/rpi/loader.elf + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) ${top_builddir}/src/platform/rpi/loader.elf -O binary ${top_builddir}/src/platform/rpi/${output_img} -loader8_img_DEPENDENCIES = loader.zwerg +loader8_img_DEPENDENCIES = loader.elf loader8_img_SOURCES = -loader8.img$(EXEEXT): ${top_builddir}/src/vendor/rpi/loader.zwerg - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --only-keep-debug ${top_builddir}/src/vendor/rpi/loader.zwerg ${top_builddir}/src/vendor/rpi/${output_sym} - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --strip-debug ${top_builddir}/src/vendor/rpi/loader.zwerg - $(BOLTHUR_SERIAL_LOADER_OBJCOPY) ${top_builddir}/src/vendor/rpi/loader.zwerg -O binary ${top_builddir}/src/vendor/rpi/${output_img} +loader8.img$(EXEEXT): ${top_builddir}/src/platform/rpi/loader.elf + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --only-keep-debug ${top_builddir}/src/platform/rpi/loader.elf ${top_builddir}/src/platform/rpi/${output_sym} + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) --strip-debug ${top_builddir}/src/platform/rpi/loader.elf + $(BOLTHUR_SERIAL_LOADER_OBJCOPY) ${top_builddir}/src/platform/rpi/loader.elf -O binary ${top_builddir}/src/platform/rpi/${output_img} diff --git a/src/vendor/rpi/loader.v6.32.ld b/src/platform/rpi/loader.v6.32.ld similarity index 84% rename from src/vendor/rpi/loader.v6.32.ld rename to src/platform/rpi/loader.v6.32.ld index e795cef..188837e 100644 --- a/src/vendor/rpi/loader.v6.32.ld +++ b/src/platform/rpi/loader.v6.32.ld @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -27,20 +27,29 @@ GROUP( ../../arch/arm/v6/libv6.a ../../arch/arm/libarm.a ../../loader/libloader.a - ../../vendor/rpi/librpi.a + ../../platform/rpi/librpi.a ) INPUT( libgcc.a ) +LOADER_LMA = 0x8000; +LOADER_OFFSET = 0x3FF8000; + SECTIONS { - /* load to 64mb border */ - . = 0x4000000; - __loader_start = .; + . = LOADER_LMA; + + /* boot loader sections */ + .text.boot : ALIGN( 4K ) { + *( .text.boot ) + } + + /* 64mb border */ + . += LOADER_OFFSET; + __loader_start = . + LOADER_OFFSET; .text ALIGN( 4K ) : AT( ADDR( .text ) ) { __text_start = .; - *( .text.boot ) *( .text ) __text_end = .; } diff --git a/src/vendor/rpi/loader.v7.32.ld b/src/platform/rpi/loader.v7.32.ld similarity index 84% rename from src/vendor/rpi/loader.v7.32.ld rename to src/platform/rpi/loader.v7.32.ld index c286302..79626de 100644 --- a/src/vendor/rpi/loader.v7.32.ld +++ b/src/platform/rpi/loader.v7.32.ld @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -27,20 +27,29 @@ GROUP( ../../arch/arm/v7/libv7.a ../../arch/arm/libarm.a ../../loader/libloader.a - ../../vendor/rpi/librpi.a + ../../platform/rpi/librpi.a ) INPUT( libgcc.a ) +LOADER_LMA = 0x8000; +LOADER_OFFSET = 0x3FF8000; + SECTIONS { - /* load to 64mb border */ - . = 0x4000000; - __loader_start = .; + . = LOADER_LMA; + + /* boot loader sections */ + .text.boot : ALIGN( 4K ) { + *( .text.boot ) + } + + /* 64mb border */ + . += LOADER_OFFSET; + __loader_start = . + LOADER_OFFSET; .text ALIGN( 4K ) : AT( ADDR( .text ) ) { __text_start = .; - *( .text.boot ) *( .text ) __text_end = .; } diff --git a/src/vendor/rpi/loader.v8.32.ld b/src/platform/rpi/loader.v8.32.ld similarity index 84% rename from src/vendor/rpi/loader.v8.32.ld rename to src/platform/rpi/loader.v8.32.ld index 0369e98..0e7547c 100644 --- a/src/vendor/rpi/loader.v8.32.ld +++ b/src/platform/rpi/loader.v8.32.ld @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -27,20 +27,29 @@ GROUP( ../../arch/arm/v8/libv8.a ../../arch/arm/libarm.a ../../loader/libloader.a - ../../vendor/rpi/librpi.a + ../../platform/rpi/librpi.a ) INPUT( libgcc.a ) +LOADER_LMA = 0x80000; +LOADER_OFFSET = 0x3F80000; + SECTIONS { - /* load to 64mb border */ - . = 0x4000000; - __loader_start = .; + . = LOADER_LMA; + + /* boot loader sections */ + .text.boot : ALIGN( 4K ) { + *( .text.boot ) + } + + /* 64mb border */ + . += LOADER_OFFSET; + __loader_start = . + LOADER_OFFSET; .text ALIGN( 4K ) : AT( ADDR( .text ) ) { __text_start = .; - *( .text.boot ) *( .text ) __text_end = .; } diff --git a/src/vendor/rpi/loader.v8.64.ld b/src/platform/rpi/loader.v8.64.ld similarity index 84% rename from src/vendor/rpi/loader.v8.64.ld rename to src/platform/rpi/loader.v8.64.ld index fdb996d..f3a4dfa 100644 --- a/src/vendor/rpi/loader.v8.64.ld +++ b/src/platform/rpi/loader.v8.64.ld @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -27,20 +27,29 @@ GROUP( ../../arch/arm/v8/libv8.a ../../arch/arm/libarm.a ../../loader/libloader.a - ../../vendor/rpi/librpi.a + ../../platform/rpi/librpi.a ) INPUT( libgcc.a ) +LOADER_LMA = 0x80000; +LOADER_OFFSET = 0x3F80000; + SECTIONS { - /* load to 64mb border */ - . = 0x4000000; - __loader_start = .; + . = LOADER_LMA; + + /* boot loader sections */ + .text.boot : ALIGN( 4K ) { + *( .text.boot ) + } + + /* 64mb border */ + . += LOADER_OFFSET; + __loader_start = . + LOADER_OFFSET; .text ALIGN( 4K ) : AT( ADDR( .text ) ) { __text_start = .; - *( .text.boot ) *( .text ) __text_end = .; } diff --git a/src/vendor/rpi/mailbox/mailbox.c b/src/platform/rpi/mailbox/mailbox.c similarity index 94% rename from src/vendor/rpi/mailbox/mailbox.c rename to src/platform/rpi/mailbox/mailbox.c index bece91e..5d9e135 100644 --- a/src/vendor/rpi/mailbox/mailbox.c +++ b/src/platform/rpi/mailbox/mailbox.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -18,8 +18,8 @@ * along with bolthur/serial-loader. If not, see . */ -#include "vendor/rpi/peripheral.h" -#include "vendor/rpi/mailbox/mailbox.h" +#include "platform/rpi/peripheral.h" +#include "platform/rpi/mailbox/mailbox.h" /** * @brief Read value from mailbox diff --git a/src/vendor/rpi/mailbox/property.c b/src/platform/rpi/mailbox/property.c similarity index 98% rename from src/vendor/rpi/mailbox/property.c rename to src/platform/rpi/mailbox/property.c index 1cd7e85..794df68 100644 --- a/src/vendor/rpi/mailbox/property.c +++ b/src/platform/rpi/mailbox/property.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -24,8 +24,8 @@ #include "loader/memcpy.h" -#include "vendor/rpi/mailbox/property.h" -#include "vendor/rpi/mailbox/mailbox.h" +#include "platform/rpi/mailbox/property.h" +#include "platform/rpi/mailbox/mailbox.h" /** * @brief property tag buffer, which needs to be aligned to 16 byte boundary diff --git a/src/vendor/rpi/vendor.c b/src/platform/rpi/platform.c similarity index 80% rename from src/vendor/rpi/vendor.c rename to src/platform/rpi/platform.c index ddce383..f40c8ee 100644 --- a/src/vendor/rpi/vendor.c +++ b/src/platform/rpi/platform.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -21,9 +21,9 @@ #include /** - * @brief vendor boot parameter + * @brief platform boot parameter */ -uint32_t vendor_boot_parameter[ 3 ]; +uint32_t platform_boot_parameter[ 3 ]; /** * @brief Kernel entry function pointer @@ -33,15 +33,15 @@ typedef void ( *kernel_entry )( uint32_t r0, uint32_t r1, uint32_t r2 ); /** * @brief Boot loaded kernel */ -void vendor_boot_kernel( void ) { +void platform_boot_kernel( void ) { // get pointer to kernel start function kernel_entry kernel = ( kernel_entry )SOC_LOAD_ADDRESS; // call kernel startup function kernel( - vendor_boot_parameter[ 0 ], - vendor_boot_parameter[ 1 ], - vendor_boot_parameter[ 2 ] + platform_boot_parameter[ 0 ], + platform_boot_parameter[ 1 ], + platform_boot_parameter[ 2 ] ); } diff --git a/src/vendor/rpi/serial.c b/src/platform/rpi/serial.c similarity index 96% rename from src/vendor/rpi/serial.c rename to src/platform/rpi/serial.c index 264297d..409b575 100644 --- a/src/vendor/rpi/serial.c +++ b/src/platform/rpi/serial.c @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -25,9 +25,9 @@ #include "arch/arm/delay.h" #include "arch/arm/mmio.h" -#include "vendor/rpi/mailbox/property.h" -#include "vendor/rpi/peripheral.h" -#include "vendor/rpi/gpio.h" +#include "platform/rpi/mailbox/property.h" +#include "platform/rpi/peripheral.h" +#include "platform/rpi/gpio.h" void serial_init( void ) { // Disable UART0. diff --git a/src/vendor/rpi/start.32.S b/src/platform/rpi/start.32.S similarity index 97% rename from src/vendor/rpi/start.32.S rename to src/platform/rpi/start.32.S index 1b7c803..6cc5c8a 100644 --- a/src/vendor/rpi/start.32.S +++ b/src/platform/rpi/start.32.S @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * @@ -81,7 +81,6 @@ boot_start: mcrr p15, 1, r3, r1, c15 #endif - #if defined( BCM2709 ) || defined( BCM2710 ) // read system control register mrc p15, 0, r3, c1, c0, 0 @@ -114,7 +113,7 @@ boot_start: blo 2b // save boot parameter - ldr r4, =vendor_boot_parameter + ldr r4, =platform_boot_parameter stmia r4!, {r0 - r2} // switch to c main diff --git a/src/vendor/rpi/start.64.S b/src/platform/rpi/start.64.S similarity index 94% rename from src/vendor/rpi/start.64.S rename to src/platform/rpi/start.64.S index 60791b2..79d0083 100644 --- a/src/vendor/rpi/start.64.S +++ b/src/platform/rpi/start.64.S @@ -1,6 +1,6 @@ /** - * Copyright (C) 2019 bolthur project. + * Copyright (C) 2019 - 2020 bolthur project. * * This file is part of bolthur/serial-loader. * diff --git a/src/vendor/Makefile.am b/src/vendor/Makefile.am deleted file mode 100644 index a0c9f1f..0000000 --- a/src/vendor/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ - -SUBDIRS = ${vendor_subdir} - -DIST_SUBDIRS = rpi