summaryrefslogtreecommitdiffstats
path: root/sys/boot
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-03-091-0/+3
|\
| * MFC r296419 (by kib):dim2016-03-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the link_elf_obj.c, handle sections of type SHT_AMD64_UNWIND same as SHT_PROGBITS. This is needed after the clang 3.8 import, which generates that type for .eh_frame section, which had SHT_PROGBITS type before. Reported by: Nikolai Lifanov <lifanov@mail.lifanov.com> PR: 207729 Tested by: dim (previous version) Sponsored by: The FreeBSD Foundation MFC r296428: Since kernel modules can now contain sections of type SHT_AMD64_UNWIND, the boot loader should not skip over these anymore while loading images. Otherwise the kernel can still panic when it doesn't find the .eh_frame section belonging to the .rela.eh_frame section. Unfortunately this will require installing boot loaders from sys/boot before attempting to boot with a new kernel. Reviewed by: kib Approved by: re (marius)
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-224-26/+1232
|\ \ | |/
| * MFC: r287299 [1]marius2016-02-223-23/+1227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a gop command to help diagnose VT efifb problems. The gop command has the following sub-commands: list - list all possible modes (paged) get - return the current mode set <mode> - set the current mode to <mode> MFC: r287317, r287422, r287475, r287489, r287538 [2] Add support for the UGA draw protocol. This includes adding a command called 'uga' to show whether UGA is implemented by the firmware and what the settings are. It also includes filling the efi_fb structure from the UGA information when GOP isn't implemented by the firmware. PR: 207313 [1], 202730 [2] Approved by: re (gjb)
| * MFC r272785:smh2016-02-201-3/+5
| | | | | | | | | | | | | | | | Null terminate boot config buffer PR: 207070 Approved by: re (gjb) Sponsored by: Multiplay
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-02-1325-434/+870
|\ \ | |/
| * Merge from current r294767,294769,295408imp2016-02-112-15/+186
| | | | | | | | | | | | | | | | r294767: Parse command line arguments in loader.fi r294769: Allow newlines to be treated as whitespace when parsing args r295408: Implement -P command line option in for EFI booting. Approved by: re@ (gjb@)
| * MFC r295320, r295356 (Partial)smh2016-02-115-181/+517
| | | | | | | | | | | | | | Fix EFI multi device boot support Approved by: re (marius) Sponsored by: Multiplay
| * MFC r294768:smh2016-02-111-1/+37
| | | | | | | | | | | | | | Process /boot/config and /boot.config during EFI boot Approved by: re (marius) Sponsored by: Multiplay
| * Fix ia64 build failures in EFI platformsmh2016-02-113-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MFC of the recent EFI work to stable/10 caused build breakage under ia64. It was not apparent that there was EFI code outside the EFI tree as this is not the case in HEAD, however in stable/10 there is for ia64. This change does the following: * Re-enables libefi for ia64 under gcc. * Adds the ignore for unsupported pragma's when building libefi for ia64. * Adds the missing parameter to efi_handle_lookup in the ia64 loader. This is a direct commit as ia64 is no longer supported after 10.x Approved by: re (marius) Sponsored by: Multiplay
| * MFC r295356 (Partial)smh2016-02-111-1/+1
| | | | | | | | | | | | | | Fix EFI platform build failures on arm.armeb Approved by: re (marius) Sponsored by: Multiplay
| * Catch the EFI loader up to the latest ZFS Boot Environment Menu featuresallanjude2016-02-105-56/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MFC: r294072 Move init_zfs_bootenv to sys/boot/zfs/zfs.c instead of having a copy in each loader MFC: r294073 Connect the ZFS boot environment menu to the UEFI loader MFC: r295357 Do not set vfs.root.mountfrom unnecessarily when initializing ZFS BE menu Approved by: re (marius) Relnotes: yes Sponsored by: ScaleEngine Inc.
| * MFC boot loader path and RBX constant deduplicationemaste2016-02-0911-196/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r294765 (imp) Move all the separate copies of the same strings into paths.h. There's nothing machine specific about these. r294765 (imp) RBX_ defines are in rbx.h, move it there. r294847 (imp) Remove static from these two. They slipped through the cracks. r294925 (imp) Fix mistake when transitioning to the new defines with ZFS loader. I hate adding yet another define, but it is the lessor of the evil choices available. Kill another evil by removing PATH_BOOT3 and replacing it with PATH_LOADER or PATH_LOADER_ZFS as appropriate. Approved by: re (gjb)
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-0349-384/+1234
|\ \ | |/
| * MFC: r294926allanjude2016-02-021-1/+1
| | | | | | | | | | | | | | ficl on i386 should cast to unsigned char output to support efi i386 Submitted by: Toomas Soome <tsoome at me.com> Approved by: re (gjb)
| * Fix clean target for sys/boot/efismh2016-01-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | Fix clean target breakage of sys/boot/efi introduced by r294981 specifically the MFC of r294029 without the related change introduced by r281114. This is direct commit to stable/10 as head uses src.opts.mk. Approved by: re (glebius) Sponsored by: Multiplay
| * MFC r294068, r294265smh2016-01-2810-8/+377
| | | | | | | | | | | | | | | | | | | | | | MFC r294068: Add EFI ZFS boot support MFC r294265: Fix broken DPRINTF and wire up EFI_DEBUG so -DEFI_DEBUG to make works. Relnotes: Yes Sponsored by: Multiplay
| * MFC r281060, r294060, r294291, r294493, r294284:smh2016-01-288-221/+607
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MFC r281060: Remove an unnecessary space in a printf call MFC r294060: Modularise EFI boot loader MFC r294291 (by andrew): Reset the filesystem cache MFC r294493: Fix EFI UFS caching MFC r294284 (by emaste): boot1: correct typo in error message Sponsored by: Multiplay
| * MFC r294506:smh2016-01-281-27/+66
| | | | | | | | | | | | Prevent loader.conf load failure due to unknown console entries Sponsored by: Multiplay
| * MFC r293835:smh2016-01-283-11/+37
| | | | | | | | | | | | Improve non-interactive forth cmd error reporting Sponsored by: Multiplay
| * MFC r286234 (by trasz):smh2016-01-281-0/+8
| | | | | | | | | | | | Fix a problem which made loader(8) load non-kld files twice. Sponsored by: Multiplay
| * MFC r294059:smh2016-01-281-1/+8
| | | | | | | | | | | | Ensure boot fsread correctly probes all partitions Sponsored by: Multiplay
| * MFC r281169, r293724, r293796, r294029, r294041, r294058smh2016-01-2840-130/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MFC r281169 (by andrew): Make global variabled only used in this file static MFC r294058: Make common boot file_loadraw name parameter const MFC r294041: Remove unused reg param from fdt_fixup_memory MFC r293724: Enable warnings in EFI boot code MFC r293796: Fix typo in libefi.c MFC r294029: Only build EFI components on supported compilers Sponsored by: Multiplay
| * MFC r294040:smh2016-01-281-1/+7
| | | | | | | | | | | | Prevent bogus compiler in ZFS boot code. Sponsored by: Multiplay
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-2713-302/+84
|\ \ | |/
| * MFC 283933: Add commentsdteske2016-01-271-3/+3
| | | | | | | | r283933: Indicate where the flag for later abort" originates.
| * MFC: r256940jkim2016-01-262-6/+13
| | | | | | | | Allow users to set UUID in network byte order regardless of SMBIOS version.
| * MFC r293460:smh2016-01-252-260/+15
| | | | | | | | | | | | | | | | | | Switch EFT boot1 to use libstand This includes a change to the Makefile comment to correct it due to the lack of arm and i386 support in 10.x. Sponsored by: Multiplay
| * MFC r293422 (partial):smh2016-01-251-14/+20
| | | | | | | | | | | | | | | | | | | | Update generated EFI boot image templates. This is a partial MFC as stable/10 only has EFI boot support for amd64, and there are no plans to change this, so the other platform images aren't included. Sponsored by: Multiplay
| * MFC r293461:smh2016-01-253-6/+0
| | | | | | | | | | | | Remove hidden "Not ufs" printfs from boot code Sponsored by: Multiplay
| * MFC r293274:smh2016-01-252-4/+3
| | | | | | | | | | | | style(9) fixes for EFI boot Sponsored by: Multiplay
| * MFC r281059 (by rpaulo):smh2016-01-251-1/+22
| | | | | | | | | | | | boot1 EFI: reset the screen and select the best mode. Sponsored by: Multiplay
| * MFC r293269:smh2016-01-251-2/+2
| | | | | | | | | | | | Fix return from zfs_probe_dev Sponsored by: Multiplay
| * MFC r293268:smh2016-01-253-8/+8
| | | | | | | | | | | | Fix _MSC_EXTENSIONS checks Sponsored by: Multiplay
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-2537-231/+1551
|\ \ | |/
| * MFC r293053, r293061, r293063, r293064, r293065, r293775, r293792:ian2016-01-241-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 64-bit math when finding a block of ram to hold the kernel. This fixes a problem on 32-bit systems which have ram occupying the end of the physical address space -- for example, a block of ram at 0x80000000 with a size of 0x80000000 was overflowing 32 bit math and ending up with a calculated size of zero. Use 64-bit math when processing the lists of physical and excluded memory to generate the phys_avail and dump_avail arrays. Work around problems that happen when there is ram at the end of the physical address space. Cast pointer through uintptr_t on the way to uint64_t to squelch a warning. Reword the comment to better describe what I found while researching the problem that led to this temporary workaround (and also so I can properly cite the PR in the commit this time). Cast using uintfptr_t and eliminate the cast to uint64_t which is uneeded because rounding down cannot increase the number of bits needed to express the result. Go back to using uintptr_t, because code that actually compiles is infinitely less buggy than code that is theoretically correct in some alternate universe. PR: 201614
| * MFC r289704:ian2016-01-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | Fix parsing of I2C addresses properties in fdt data. I2C address is represented in 7-bits format in DT files, but system expect it in 8-bit format. Also, fix two drivers that locally hack around this bug. This includes a direct-commit change to the beaglebone dts data in the 10-stable branch to adjust the i2c slave addresses directly. In -current the equivelent change happened with a switch from homegrown to standard fdt data.
| * MFC 292682:jhb2016-01-213-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fix remaining direct tests of the carry flag in the v86 %eflags via a magic number to use V86_CY() instead. These should have been fixed as part of the cleanup in r226746 but were missed. The md5 sums of the object files were unchanged, so there should be no functional change. PR: 205424 Submitted by: Alexander Kuleshov <kuleshovmail@gmail.com>
| * Leave temporary ia64 loader.sym behind if the build failsemaste2016-01-201-1/+0
| | | | | | | | | | This facilitates investigation of the build failure, and is the same way it's done for other architectures using EFI.
| * MFC r293245: loader.efi style(9) cleanupemaste2016-01-201-35/+29
| | | | | | | | Submitted by: smh
| * MFC r293234: Enable the beastie menu for the UEFI consoleemaste2016-01-203-11/+4
| | | | | | | | | | | | | | As of r294445 [in stable/10] the UEFI console includes basic terminal emulator support. Relnotes: Yes
| * MFC r293233: loader.efi: add terminal emulation supportemaste2016-01-204-20/+406
| | | | | | | | | | | | | | This is based on the vidconsole implementation. Submitted by: Toomas Soome <tsoome@me.com> Relnotes: Yes
| * MFC r277215, r277291, r277418, r280953 and r280954:royger2016-01-2016-94/+989
| | | | | | | | | | | | | | | | | | loader: implement multiboot support for Xen Dom0 Note that only the subset of the multiboot specification needed in order to boot a Xen Dom0 is implemented. Sponsored by: Citrix Systems R&D
| * MFC r292888:ian2016-01-191-2/+8
| | | | | | | | | | | | | | Fix the error checking for the ubenv command. This moves the check for an empty ldvar (which amounts to the varname string starting with '=') into the if block that manipulates ldvar, which avoids later referencing ldvar when it was never initialized.
| * MFC r292584:ian2016-01-191-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set env vars from values on the efi loader command line. Examine each cmdline arg and if it contains an '=' convert it to ascii and pass it to putenv(). This allows var=value settings to come in on the command line. This will allow overriding dhcp server-provided data in loader(8), as discussed in PR 202098 PR: 202098 Relnotes: Yes (this goes together with r294343)
| * MFC r292234, r292527:ian2016-01-191-2/+2
| | | | | | | | Add strlcat() and strlcpy() to libstand and libstand32.
| * MFC r291164, r291876, r292227:ian2016-01-191-13/+36
| | | | | | | | | | | | | | | | | | | | Print more detailed info about the disk and partition chosen for booting. No behavioral changes, just cosmetics. Remove stray unescaped `%` in `Booting from ...` informational message. Enhance the "ubenv import" command to allow importing a u-boot env var directly into a loader (and thus kernel) env var.
| * MFC r281058: Remove whitespace.emaste2016-01-181-13/+12
| |
| * MFC r293244: Introduce and use new EFI_ERROR_CODE macro for EFI errorsemaste2016-01-184-9/+9
| |
| * MFC r293165: loader.efi: support non-contiguous console modesemaste2016-01-181-2/+3
| |
OpenPOWER on IntegriCloud