Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit d0b2dbfa0ecf)
Address two issues with current help file logic: The existing condition prevents the common help file from being installed when there are no additional help files defined. This results in no loader.help on EFI platforms, for example. Second, due to the fact that we build and install multiple loader types, each successive install will clobber the previous loader.help. The result is that we could lose type-specific commands, or possibly list them in loaders that do not have such commands. Instead, give each loader type a uniquely named help file. The EFI loader will look for /boot/loader.help.efi, userboot will look for /boot/loader.help.userboot, etc. The interpreter variant has no effect on which help file is loaded. This leaves the old /boot/loader.help unused. Some credit for the final approach goes to Mathieu <sigsys@gmail.com> for their version of the fix in https://reviews.freebsd.org/D22951. PR: 267134 Reported by: Daniel O'Connor <darius@dons.net.au> Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D28591 (cherry picked from commit 8859960436f5727f163a7b3468e08710c5e6d874)
This change slipped through my checks, and should not have been merged. mips is still supported in stable/13. This reverts commit e006859bce01b2f10349a804cade3688f40557e3.
md_copymodules, bi_copymdoules, bi_copymodules32 (x2) and bi_copymodules64 (x2) are all the same routine... Replace them all with md_copymodules. This saves about 800 bytes on i386 BIOS loader, which is a nice bonus. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D36572 (cherry picked from commit 5d1531d9d4e7d1b1b706ab23ac3f864416e87522) stand: fix mismerge Remove stray line from mismerge of 5d1531d9d4e7. This is no longer needed. Fixes: 5d1531d9d4e7 Sponsored by: Netflix (cherry picked from commit dd2b9c2967767b19bcbc33de0e487405c612f59f) stand/efi: Call md_copymodules based on __LP64__ to fix 32-bit arm When I refactored everything, I neglected to pass in the proper is64 value on 32-bit platforms. This corrects that. This prevented armv7 and armv6 platforms from booting due to misaligned data in the kernel. The only platform we support 32-bit booting in armv[67], which I apparently neglected to test before commiting my refactoring. Tested by: skibo Fixes: 5d1531d9d4e7d Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37095 (cherry picked from commit e0c3f66b4d5f0282e9c7c4803c4cd26b5a388a38)
Store whether or not we found a vbefb module (eg, a tg supported kernel) in the preloaded_file structure. This automatically resets on reload and eliminates load_elf knowing about any gfx_* interface. Restrict this to i386, which is the only place it's used. Update libi386 to check in the preloaded_file struct. Eliminate this from the teken_gfx structure. Rewrite the parsing code to be more inline. Check this from the same place we check for a relocatable amd64 kernel. Sponsored by: Netflix Reviewed by: manu, tsoome Differential Revision: https://reviews.freebsd.org/D33427 (cherry picked from commit aaaa5a2e68e256101c9737c30ad142f1c3f05131)
As part of decommissioning mips support, remove the boot loader support. Do this in advance of other boot loader work to limit the amount of work that will be thrown away. Sponsored by: Netflix Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D33377 (cherry picked from commit 20b23ae74b2bd60ba87c626b86713be746116d1e)
The elf loader needs to know how to reach into the gfx_fb code, so simplify how we include files to find that stuff. Sponsored by: Netflix Reviewed by: manu, tsoome Differential Revision: https://reviews.freebsd.org/D33376 (cherry picked from commit 2220b759d6b8cf912572fb22052edc5db4683dca)
When VECTX is enabled as a kernel option and non-EFI loaders are built, many reads will fail due to the mis-match of whether LOADER_VERIEXEC_VECTX or not in readin.h. Source that includes bootstrap.h must ensure the kernel option agrees with the compile time CFLAGS in the various make related files. Submitted by: bret_ketchum@dell.com (original revision) Reviewed by: sjg, bdrewery, dab, bret_ketchum@dell.com MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D29993 (cherry picked from commit eda28feb2e070e21db3d50b3fc177f88380b8fb4)
- s/independant/independent/ (cherry picked from commit c44b5e090d84f911551d038f61e7cf798a843b8c)
stand/common: Add file_addbuf() libsa: Add support for timestamp logging (tslog) stand/common: Add support for timestamp logging (tslog) i386/loader: Call tslog_init efi/loader: Call tslog_init (+ bugfix) stand/common command_boot: Pass tslog to kernel kern_tslog: Include tslog data from loader loader: Use tslog to instrument some functions Add userland boot profiling to TSLOG (+ bugfix) Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 60a978bec9123fcb9c74bd925e06dd3f4faddac6) (cherry picked from commit e193d3ba337757a27148a38494d3df106b826d1c) (cherry picked from commit c8dfc327db2373c721a35efe857cf07262fd7dd0) (cherry picked from commit c4b65e954f0f4754941f5b37436231f611b76d67) (cherry picked from commit f49381ccb6bc8a5733f1aa505e716eddae299986) (cherry picked from commit 537a44bf281559d304850b5e28b6f8b8e44fd593) (cherry picked from commit fe51b5a76de38d20cddc05a4c6cb1103d1a0547e) (cherry picked from commit 313724bab940c1844fda3d797cf88cd46780e62a) (cherry picked from commit 46dd801acb2318c8464b185893bb111f09b71138) (cherry picked from commit 52e125c2bd302982c179ecc920cc9a6e166033d6) (cherry picked from commit 19e4f2f289fb8d2b14576a65ca9e6f931dbb6a02)