diff --git a/FSDrivers/IA32/LICENSE.txt b/FSDrivers/IA32/LICENSE.txt deleted file mode 100644 index cdeae2b89e88..000000000000 --- a/FSDrivers/IA32/LICENSE.txt +++ /dev/null @@ -1,47 +0,0 @@ -Licensing for the filesystem drivers is complex. Three different licenses -apply to various parts of the code: - -* Christoph Pfisterer's original file system wrapper (FSW) code is covered - by a BSD-style license. Many of the source files with names that take the - form fsw_*.[ch] are so licensed, but this is NOT generally true of - filesystem-specific files (e.g., fsw_ext2.c or fsw_btrfs.c). - -* Certain filesystem drivers are licensed under the GPLv2, either because - they borrow code from the Linux kernel or because a developer (typically - Oracle) applied the GPLv2 license to them. This is true of the ext2fs, - ext4fs, ReiserFS, HFS+, and ISO-9660 drivers. - -* At least one filesystem driver (Btrfs) uses code taken from GRUB, and so - uses the GPLv3 (or later) license. - -Note that the GPLv2 and GPLv3 are, ironically, not compatible licenses. -Thus, code from GPLv2 and GPLv3 projects should not be mixed. The BSD -license used by Pfisterer's original code is compatible with both versions -of the GPL, so the fact that both GPLv2 and GPLv3 drivers is built upon it -is OK. If you intend to contribute to this project's drivers or use the -code yourself, please keep this fact in mind. - -The below was written by Christoph Pfisterer with respect to his original -code: - - File System Wrapper License -============================= - -The various parts of the File System Wrapper source code come from -different sources and may carry different licenses. Here's a quick -account of the situation: - - * The core code was written from scratch and is covered by a - BSD-style license. - - * The EFI host driver was written from scratch, possibly using code - from the TianoCore project and Intel's EFI Application Toolkit. It - is covered by a BSD-style license. - - * The ext2 and reiserfs file system drivers use definitions from the - Linux kernel source. The actual code was written from scratch, - using multiple sources for reference. These drivers are covered by - the GNU GPL. - -For more details, see each file's boilerplate comment. The full text -of the GNU GPL is in the file LICENSE_GPL.txt. diff --git a/FSDrivers/IA32/LICENSE_GPL.txt b/FSDrivers/IA32/LICENSE_GPL.txt deleted file mode 100644 index d60c31a97a54..000000000000 --- a/FSDrivers/IA32/LICENSE_GPL.txt +++ /dev/null @@ -1,340 +0,0 @@ - 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 - - 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. - - - 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 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) 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. - - , 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. diff --git a/FSDrivers/IA32/exfat_ia32.efi b/FSDrivers/IA32/exfat_ia32.efi deleted file mode 100644 index d293a24ccdf1..000000000000 Binary files a/FSDrivers/IA32/exfat_ia32.efi and /dev/null differ diff --git a/FSDrivers/IA32/ext2_ia32.efi b/FSDrivers/IA32/ext2_ia32.efi deleted file mode 100644 index b512afe8289a..000000000000 Binary files a/FSDrivers/IA32/ext2_ia32.efi and /dev/null differ diff --git a/FSDrivers/IA32/ext4_ia32.efi b/FSDrivers/IA32/ext4_ia32.efi deleted file mode 100644 index 445b89c9164c..000000000000 Binary files a/FSDrivers/IA32/ext4_ia32.efi and /dev/null differ diff --git a/FSDrivers/IA32/ntfs_ia32.efi b/FSDrivers/IA32/ntfs_ia32.efi deleted file mode 100644 index edea0d6eb226..000000000000 Binary files a/FSDrivers/IA32/ntfs_ia32.efi and /dev/null differ diff --git a/FSDrivers/X64/LICENSE.txt b/FSDrivers/X64/LICENSE.txt deleted file mode 100644 index cdeae2b89e88..000000000000 --- a/FSDrivers/X64/LICENSE.txt +++ /dev/null @@ -1,47 +0,0 @@ -Licensing for the filesystem drivers is complex. Three different licenses -apply to various parts of the code: - -* Christoph Pfisterer's original file system wrapper (FSW) code is covered - by a BSD-style license. Many of the source files with names that take the - form fsw_*.[ch] are so licensed, but this is NOT generally true of - filesystem-specific files (e.g., fsw_ext2.c or fsw_btrfs.c). - -* Certain filesystem drivers are licensed under the GPLv2, either because - they borrow code from the Linux kernel or because a developer (typically - Oracle) applied the GPLv2 license to them. This is true of the ext2fs, - ext4fs, ReiserFS, HFS+, and ISO-9660 drivers. - -* At least one filesystem driver (Btrfs) uses code taken from GRUB, and so - uses the GPLv3 (or later) license. - -Note that the GPLv2 and GPLv3 are, ironically, not compatible licenses. -Thus, code from GPLv2 and GPLv3 projects should not be mixed. The BSD -license used by Pfisterer's original code is compatible with both versions -of the GPL, so the fact that both GPLv2 and GPLv3 drivers is built upon it -is OK. If you intend to contribute to this project's drivers or use the -code yourself, please keep this fact in mind. - -The below was written by Christoph Pfisterer with respect to his original -code: - - File System Wrapper License -============================= - -The various parts of the File System Wrapper source code come from -different sources and may carry different licenses. Here's a quick -account of the situation: - - * The core code was written from scratch and is covered by a - BSD-style license. - - * The EFI host driver was written from scratch, possibly using code - from the TianoCore project and Intel's EFI Application Toolkit. It - is covered by a BSD-style license. - - * The ext2 and reiserfs file system drivers use definitions from the - Linux kernel source. The actual code was written from scratch, - using multiple sources for reference. These drivers are covered by - the GNU GPL. - -For more details, see each file's boilerplate comment. The full text -of the GNU GPL is in the file LICENSE_GPL.txt. diff --git a/FSDrivers/X64/LICENSE_GPL.txt b/FSDrivers/X64/LICENSE_GPL.txt deleted file mode 100644 index d60c31a97a54..000000000000 --- a/FSDrivers/X64/LICENSE_GPL.txt +++ /dev/null @@ -1,340 +0,0 @@ - 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 - - 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. - - - 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 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) 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. - - , 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. diff --git a/FSDrivers/X64/exfat_ia32.efi b/FSDrivers/X64/exfat_ia32.efi deleted file mode 100644 index d293a24ccdf1..000000000000 Binary files a/FSDrivers/X64/exfat_ia32.efi and /dev/null differ diff --git a/FSDrivers/X64/exfat_x64.efi b/FSDrivers/X64/exfat_x64.efi deleted file mode 100644 index 5e1f8a8010ce..000000000000 Binary files a/FSDrivers/X64/exfat_x64.efi and /dev/null differ diff --git a/FSDrivers/X64/ext2_x64.efi b/FSDrivers/X64/ext2_x64.efi deleted file mode 100644 index 1da0928d38c0..000000000000 Binary files a/FSDrivers/X64/ext2_x64.efi and /dev/null differ diff --git a/FSDrivers/X64/ext4_x64.efi b/FSDrivers/X64/ext4_x64.efi deleted file mode 100644 index bcb65fc0ffca..000000000000 Binary files a/FSDrivers/X64/ext4_x64.efi and /dev/null differ diff --git a/FSDrivers/X64/ntfs_x64.efi b/FSDrivers/X64/ntfs_x64.efi deleted file mode 100644 index 5aaa97aca06f..000000000000 Binary files a/FSDrivers/X64/ntfs_x64.efi and /dev/null differ diff --git a/FSDrivers/exfat.inf b/FSDrivers/exfat.inf deleted file mode 100644 index caf940cfda66..000000000000 --- a/FSDrivers/exfat.inf +++ /dev/null @@ -1,27 +0,0 @@ -# ReadOnly exFAT filesystem driver -# From https://efi.akeo.ie/ v1.5 -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = exfat - FILE_GUID = CB683001-379F-48C7-B7B6-707D29454BF5 - MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.0 - - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -VALID_ARCHITECTURES = X64 IA32 - -[Binaries.X64] - PE32|X64/exfat_x64.efi|* - -[Binaries.IA32] - PE32|IA32/exfat_ia32.efi|* - - diff --git a/FSDrivers/ext2.inf b/FSDrivers/ext2.inf deleted file mode 100644 index 67a985e38515..000000000000 --- a/FSDrivers/ext2.inf +++ /dev/null @@ -1,25 +0,0 @@ -# EXT2 filesystem driver. See */LICENSE.txt for details. -# https://www.rodsbooks.com/refind/ v0.12 - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = ext2 - FILE_GUID = 8EC49C43-D1C4-4E6C-98BF-232CA5D89A1B - MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.0 - - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -VALID_ARCHITECTURES = X64 IA32 - -[Binaries.X64] - PE32|X64/ext2_x64.efi|* - -[Binaries.IA32] - PE32|IA32/ext2_ia32.efi|* - diff --git a/FSDrivers/ext4.inf b/FSDrivers/ext4.inf deleted file mode 100644 index c9d0807251cd..000000000000 --- a/FSDrivers/ext4.inf +++ /dev/null @@ -1,25 +0,0 @@ -# EXT4 filesystem driver. See */LICENSE.txt for details. -# https://www.rodsbooks.com/refind/ v0.12 - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = ext4 - FILE_GUID = 9d380387-a15a-4053-ae19-ff3495b6d0d5 - MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.0 - - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -VALID_ARCHITECTURES = X64 IA32 - -[Binaries.X64] - PE32|X64/ext4_x64.efi|* - -[Binaries.IA32] - PE32|IA32/ext4_ia32.efi|* - diff --git a/FSDrivers/ntfs.inf b/FSDrivers/ntfs.inf deleted file mode 100644 index 804f655cd749..000000000000 --- a/FSDrivers/ntfs.inf +++ /dev/null @@ -1,27 +0,0 @@ -# ReadOnly NTFS filesystem driver -# From https://efi.akeo.ie/ v1.5 -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = ntfs - FILE_GUID = 2282efd0-678b-4753-8d06-200d5940285d - MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.0 - - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -VALID_ARCHITECTURES = X64 IA32 - -[Binaries.X64] - PE32|X64/ntfs_x64.efi|* - -[Binaries.IA32] - PE32|IA32/ntfs_ia32.efi|* - - diff --git a/Readme.md b/Readme.md index 38b1b17dc453..1ebfc457c1d7 100644 --- a/Readme.md +++ b/Readme.md @@ -15,13 +15,6 @@ To build on Linux run: `build -D SERIAL_TERMINAL=FALSE -D SECURE_BOOT_ENABLE=TRUE -D BOOTLOADER=COREBOOT -DPS2_KEYBOARD_ENABLE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc` -To add PXE support on Intel PRO/1000 network cards run: - -`build -D NETWORK_INTEL_PRO1000=TRUE -D NETWORK_ENABLE=TRUE -D NETWORK_PXE_BOOT=TRUE -D SERIAL_TERMINAL=FALSE -D SECURE_BOOT_ENABLE=TRUE -D BOOTLOADER=COREBOOT -DPS2_KEYBOARD_ENABLE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc` - -To use iPXE as payload: -`build -D NETWORK_IPXE=TRUE -D SERIAL_TERMINAL=FALSE -D SECURE_BOOT_ENABLE=TRUE -D BOOTLOADER=COREBOOT -DPS2_KEYBOARD_ENABLE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc` - # License Details The majority of the content in the EDK II open source project uses a diff --git a/UefiPayloadPkg/Library/CbSMMStoreLib/CorebootSMMStore.c b/UefiPayloadPkg/Library/CbSMMStoreLib/CorebootSMMStore.c index 5cbb66b53fb6..b919dbef17fa 100644 --- a/UefiPayloadPkg/Library/CbSMMStoreLib/CorebootSMMStore.c +++ b/UefiPayloadPkg/Library/CbSMMStoreLib/CorebootSMMStore.c @@ -145,7 +145,7 @@ SMMStoreRead ( return EFI_NO_RESPONSE; } - CopyMem (Buffer, (VOID *)(mSmmStoreInfo->ComBuffer + Offset), *NumBytes); + CopyMem (Buffer, (VOID *)(UINTN)(mSmmStoreInfo->ComBuffer + Offset), *NumBytes); return EFI_SUCCESS; } @@ -186,7 +186,7 @@ SMMStoreWrite ( mArgComBuf->raw_write.bufoffset = Offset; mArgComBuf->raw_write.block_id = Lba; - CopyMem ((VOID *)(mSmmStoreInfo->ComBuffer + Offset), Buffer, *NumBytes); + CopyMem ((VOID *)(UINTN)(mSmmStoreInfo->ComBuffer + Offset), Buffer, *NumBytes); Result = call_smm(mSmmStoreInfo->ApmCmd, SMMSTORE_CMD_RAW_WRITE, mArgComBufPhys); if (Result == SMMSTORE_RET_FAILURE) { diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index 9d7bcb35f2c4..eb4175946eff 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -555,11 +555,6 @@ PlatformBootManagerAfterConsole ( // PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE); - // - // Register iPXE - // - PlatformRegisterFvBootOption (PcdGetPtr (PcdiPXEFile), L"iPXE Network boot", LOAD_OPTION_ACTIVE); - Print (L"Pess ESC to enter Boot Manager Menu.\n"); } diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 406c59c0b588..89e55b30ad42 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -69,7 +69,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand gUefiPayloadPkgTokenSpaceGuid.PcdShellFile - gUefiPayloadPkgTokenSpaceGuid.PcdiPXEFile gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity diff --git a/UefiPayloadPkg/NetworkDrivers/E0027X7.EFI b/UefiPayloadPkg/NetworkDrivers/E0027X7.EFI deleted file mode 100644 index 00503e3ea232..000000000000 Binary files a/UefiPayloadPkg/NetworkDrivers/E0027X7.EFI and /dev/null differ diff --git a/UefiPayloadPkg/NetworkDrivers/E4015X5.EFI b/UefiPayloadPkg/NetworkDrivers/E4015X5.EFI deleted file mode 100644 index 6b7e317912d0..000000000000 Binary files a/UefiPayloadPkg/NetworkDrivers/E4015X5.EFI and /dev/null differ diff --git a/UefiPayloadPkg/NetworkDrivers/E7512X4.EFI b/UefiPayloadPkg/NetworkDrivers/E7512X4.EFI deleted file mode 100644 index f8a41b00b294..000000000000 Binary files a/UefiPayloadPkg/NetworkDrivers/E7512X4.EFI and /dev/null differ diff --git a/UefiPayloadPkg/NetworkDrivers/E9112X3.EFI b/UefiPayloadPkg/NetworkDrivers/E9112X3.EFI deleted file mode 100644 index 162b8a9a7c5d..000000000000 Binary files a/UefiPayloadPkg/NetworkDrivers/E9112X3.EFI and /dev/null differ diff --git a/UefiPayloadPkg/NetworkDrivers/ipxe.efi b/UefiPayloadPkg/NetworkDrivers/ipxe.efi deleted file mode 100644 index fa6f494624f9..000000000000 Binary files a/UefiPayloadPkg/NetworkDrivers/ipxe.efi and /dev/null differ diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayloadPkg.dec index 2613daa52474..8cdaa15f1f9a 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dec +++ b/UefiPayloadPkg/UefiPayloadPkg.dec @@ -63,9 +63,6 @@ gUefiPayloadPkgTokenSpaceGuid.PcdPayloadStackTop|0x90000|UINT32|0x10000004 ## FFS filename to find the shell application. gUefiPayloadPkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }|VOID*|0x10000005 -### FFS filename to find the ipxe application. -gUefiPayloadPkgTokenSpaceGuid.PcdiPXEFile|{ 0xC7, 0x53, 0x86, 0xb6, 0xA1, 0xEE, 0x35, 0x44, 0xA1, 0x99, 0xA4, 0x4F, 0x59, 0xE4, 0x47, 0x6C }|VOID*|0x10000006 - ## Used to help reduce fragmentation in the EFI memory map gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x08|UINT32|0x10000012 gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x04|UINT32|0x10000013 diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index 52e72faedce6..ed6c86ecc972 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -11,15 +11,15 @@ ################################################################################ [FD.UefiPayload] BaseAddress = 0x800000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase -Size = 0x800000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize +Size = 0x140000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize ErasePolarity = 1 BlockSize = 0x1000 -NumBlocks = 0x800 +NumBlocks = 0x140 -0x00000000|0x040000 +0x00000000|0x020000 FV = PEIFV -0x00040000|0x7C0000 +0x00020000|0x120000 FV = DXEFV ################################################################################ @@ -166,95 +166,29 @@ INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf -INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf +#INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf -# -# Filesystem drivers -# -!if $(ARCH) == IA32 -INF RuleOverride=BINARY USE = IA32 FSDrivers/exfat.inf -INF RuleOverride=BINARY USE = IA32 FSDrivers/ext2.inf -INF RuleOverride=BINARY USE = IA32 FSDrivers/ntfs.inf -INF RuleOverride=BINARY USE = IA32 FSDrivers/ext4.inf -!else -INF RuleOverride=BINARY USE = X64 FSDrivers/exfat.inf -INF RuleOverride=BINARY USE = X64 FSDrivers/ext2.inf -INF RuleOverride=BINARY USE = X64 FSDrivers/ntfs.inf -INF RuleOverride=BINARY USE = X64 FSDrivers/ext4.inf -!endif - # # SD/eMMC Support # -INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf -INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf -INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf +#INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf +#INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf +#INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf # # Usb Support # -INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf +#INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf -# -# Network Support -# -!include NetworkPkg/Network.fdf.inc - - -# -# Network modules (only available on X64) -# Available at https://downloadcenter.intel.com/download/29137?v=t -# -!if $(NETWORK_ENABLE) -!if $(ARCH) == IA32 - # FIXME -!else -!if $(NETWORK_INTEL_GBE) - FILE DRIVER = D25C6DB6-0218-4BE9-802A-2841A7DA5ABE { - SECTION PE32 = UefiPayloadPkg/NetworkDrivers/E0027X7.EFI - } -!endif -!if $(NETWORK_INTEL_40GBE) - FILE DRIVER = F49F4961-BE4F-4102-A07D-111E148D0974 { - SECTION PE32 = UefiPayloadPkg/NetworkDrivers/E4015X5.EFI - } -!endif -!if $(NETWORK_INTEL_10GBE) - FILE DRIVER = 3E04EC12-5FDA-4BA8-88BB-5AB1467F280E { - SECTION PE32 = UefiPayloadPkg/NetworkDrivers/E7512X4.EFI - } -!endif -!if $(NETWORK_INTEL_PRO1000) - FILE DRIVER = BF21AF15-235B-4387-B62B-79134BC81E22 { - SECTION PE32 = UefiPayloadPkg/NetworkDrivers/E9112X3.EFI - } -!endif -!endif -!endif - -# -# iPXE support -# -!if (NETWORK_IPXE) - FILE FREEFORM = B68653C7-EEA1-4435-A199-A44F59E4476C { - SECTION PE32 = UefiPayloadPkg/NetworkDrivers/ipxe.efi - } -!endif - -# -# Random Number Generator -# -INF SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf - # # Security # diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc index 988a59f576b7..7e1450525f90 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc @@ -78,7 +78,7 @@ # # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI_BIN] # - DEFINE SHELL_TYPE = BUILD_SHELL + DEFINE SHELL_TYPE = NONE # # Security options: @@ -86,25 +86,6 @@ DEFINE SECURE_BOOT_ENABLE = FALSE DEFINE TPM_ENABLE = TRUE - # - # Network definition - # - DEFINE NETWORK_PXE_BOOT = FALSE - DEFINE NETWORK_ENABLE = FALSE - DEFINE NETWORK_TLS_ENABLE = FALSE - DEFINE NETWORK_IP6_ENABLE = FALSE - DEFINE NETWORK_IP4_ENABLE = FALSE - DEFINE NETWORK_SNP_ENABLE = FALSE - DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE - DEFINE NETWORK_ISCSI_ENABLE = FALSE - -!include NetworkPkg/NetworkDefines.dsc.inc - - # - # IPXE support - # - DEFINE NETWORK_IPXE = FALSE - [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -228,14 +209,8 @@ IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf -# -# Network -# -!include NetworkPkg/NetworkLibs.dsc.inc - !if $(NETWORK_TLS_ENABLE) == TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !else OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf !endif @@ -326,9 +301,6 @@ MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf -!if $(NETWORK_ENABLE) == TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -!endif ################################################################################ # @@ -368,11 +340,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F !endif - # - # Network Pcds - # -!include NetworkPkg/NetworkPcds.dsc.inc - # # The following parameters are set by Library/PlatformHookLib # @@ -542,7 +509,6 @@ MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf - MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf @@ -575,21 +541,21 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf + #MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf # # SD/eMMC Support # - MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf - MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf - MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + #MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf + #MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf + #MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf # # Usb Support # - MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf + #MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf @@ -605,12 +571,6 @@ MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif - # - # SMBUS Support - # - UefiPayloadPkg/SmbusDxe/SMBusi801Dxe.inf - UefiPayloadPkg/SmbusConfigLoaderDxe/SMBusConfigLoader.inf - # # Console Support # @@ -629,26 +589,6 @@ UefiPayloadPkg/BlSMMStoreDxe/BlSMMStoreDxe.inf !endif - # - # Network Support - # -!include NetworkPkg/NetworkComponents.dsc.inc - -!if $(NETWORK_TLS_ENABLE) == TRUE - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf { - - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf - } -!endif - - # - # Random Number Generator - # - SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf { - - RngLib|UefiPayloadPkg/Library/BaseRngLib/BaseRngLib.inf - } - !if $(TPM_ENABLE) == TRUE SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc index 4c5bf2613e49..76f42a776e5e 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc @@ -78,7 +78,7 @@ # # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI_BIN] # - DEFINE SHELL_TYPE = BUILD_SHELL + DEFINE SHELL_TYPE = NONE # # Security options: @@ -86,37 +86,6 @@ DEFINE SECURE_BOOT_ENABLE = FALSE DEFINE TPM_ENABLE = TRUE - # - # Network definition - # - DEFINE NETWORK_PXE_BOOT = FALSE - DEFINE NETWORK_ENABLE = FALSE - DEFINE NETWORK_TLS_ENABLE = FALSE - DEFINE NETWORK_IP6_ENABLE = FALSE - DEFINE NETWORK_IP4_ENABLE = TRUE - DEFINE NETWORK_INTEL_10GBE = FALSE - DEFINE NETWORK_INTEL_PRO1000 = FALSE - DEFINE NETWORK_INTEL_40GBE = FALSE - DEFINE NETWORK_INTEL_GBE = FALSE - -!if $(NETWORK_PXE_BOOT) == TRUE - DEFINE NETWORK_SNP_ENABLE = TRUE - DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE - DEFINE NETWORK_ISCSI_ENABLE = FALSE -!else - DEFINE NETWORK_SNP_ENABLE = FALSE - DEFINE NETWORK_HTTP_BOOT_ENABLE = TRUE - DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE - DEFINE NETWORK_ISCSI_ENABLE = TRUE -!endif - - -!include NetworkPkg/NetworkDefines.dsc.inc - # - # IPXE support - # - DEFINE NETWORK_IPXE = FALSE - [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -240,13 +209,8 @@ IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf -# -# Network -# -!include NetworkPkg/NetworkLibs.dsc.inc !if $(NETWORK_TLS_ENABLE) == TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !else OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf !endif @@ -336,9 +300,7 @@ MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf -!if $(NETWORK_ENABLE) == TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -!endif + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform. @@ -378,11 +340,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F !endif - # - # Network Pcds - # -!include NetworkPkg/NetworkPcds.dsc.inc - # # The following parameters are set by Library/PlatformHookLib # @@ -587,21 +544,21 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf + #MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf # # SD/eMMC Support # - MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf - MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf - MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + #MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf + #MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf + #MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf # # Usb Support # - MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf + #MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf @@ -636,26 +593,6 @@ UefiPayloadPkg/BlSMMStoreDxe/BlSMMStoreDxe.inf !endif - # - # Network Support - # -!include NetworkPkg/NetworkComponents.dsc.inc - -!if $(NETWORK_TLS_ENABLE) == TRUE - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf { - - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf - } -!endif - - # - # Random Number Generator - # - SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf { - - RngLib|UefiPayloadPkg/Library/BaseRngLib/BaseRngLib.inf - } - !if $(TPM_ENABLE) == TRUE SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { @@ -692,6 +629,7 @@ DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf + !include NetworkPkg/NetworkLibs.dsc.inc [Components.X64] ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {