summaryrefslogtreecommitdiffstats
path: root/sys/boot
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2017-02-096-338/+23
|\
| * MFC r311933:dim2017-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use proper prototypes in struct boot_module_t With clang 4.0.0, we are getting the following warnings about struct boot_module_t in efi's boot_module.h: In file included from sys/boot/efi/boot1/ufs_module.c:41: sys/boot/efi/boot1/boot_module.h:67:14: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] void (*init)(); ^ void sys/boot/efi/boot1/boot_module.h:92:16: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] void (*status)(); ^ void sys/boot/efi/boot1/boot_module.h:95:24: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] dev_info_t *(*devices)(); ^ void 3 errors generated. Fix this by adding 'void' to the parameter lists. No functional change. Reviewed by: emaste, imp, smh Differential Revision: https://reviews.freebsd.org/D9144
| * MFC r311932:dim2017-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make EFI_RESERVED_SERVICE a proper prototype With clang 4.0.0, the EFI API header causes the following warning: In file included from sys/boot/efi/loader/bootinfo.c:43: In file included from sys/boot/efi/loader/../include/efi.h:52: sys/boot/efi/include/efiapi.h:534:32: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] (EFIAPI *EFI_RESERVED_SERVICE) ( ^ Add VOID to make it into a real prototype. Reviewed by: imp, emaste, tsoome Differential Revision: https://reviews.freebsd.org/D9132
| * MFC r311929:dim2017-01-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't include <errno.h> in reloc_elf.c, as it includes <stand.h> just after it, which has a conflicting definition of errno. This leads to the following warning with clang 4.0.0: In file included from sys/boot/common/reloc_elf32.c:6: In file included from sys/boot/common/reloc_elf.c:37: /usr/obj/usr/src/tmp/usr/include/stand.h:155:12: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] extern int errno; ^ sys/sys/errno.h:46:26: note: expanded from macro 'errno' #define errno (* __error()) ^
| * MFC r310417asomers2017-01-201-0/+1
| | | | | | | | Add a dumpdev example to /boot/defaults/loader.conf
| * MFC r293040,293341,293435:delphij2017-01-192-334/+18
| | | | | | | | | | | | Reduce libstand Makefile duplication. PR: 216251
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-12-055-9/+130
|\ \ | |/
| * MFC r308089: zfsbootcfg: a simple tool to set next boot (one time)avg2016-11-215-9/+130
| | | | | | | | | | | | | | options for zfsboot There is a branch-specific change in sbin/zfsbootcfg/Makefile because of LIBADD vs LDADD/DPADD.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-10-191-0/+8
|\ \ | |/
| * MFC 305588sephe2016-10-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | pxeboot: Add nfs.read_size tunable. Increase this tunable improves kernel loading speed. Submitted by: Jun Su <junsu microsoft com> Reviewed by: rpokala, wblock (previous version) Obtained from: DragonFlyBSD Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D7756
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-10-062-6/+3
|\ \ | |/
| * MFC r274925: misc mdoc fixes.pluknet2016-09-272-6/+3
| |
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-09-122-3/+5
|\ \ | |/
| * MFC r303891, r303892:pfg2016-09-081-1/+1
| | | | | | | | | | | | | | | | sys: replace comma with semicolon when pertinent. Uses of commas instead of a semicolons can easily go undetected. The comma can serve as a statement separator but this shouldn't be abused when statements are meant to be standalone.
| * MFC r303738: report sector size and number of sectors in lsdev outputavg2016-09-061-2/+4
| | | | | | | | for bios disks
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-08-251-0/+12
|\ \ | |/
| * MFC 304018: Add defines needed to export SMBIOS serial numbersjhb2016-08-191-0/+12
| | | | | | | | | | | | | | | | Some defines needed for exporting serial numbers from the SMBIOS were missed during integration of SMBIOS support in the EFI boot loader (r281138). This is needed for getting the hostid set from the system hardware UUID. PR: 206031
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-07-262-1/+3
|\ \ | |/
| * MFC r297871: boot1.efifat: provide a fallback startup.nshemaste2016-07-251-0/+2
| | | | | | | | | | | | | | | | | | In case the firmware falls through to executing startup.sh, populate it with the name of our boot loader. In normal operation this should not be necessary but may allow the system to boot if it would otherwise just remain at a shell prompt. Sponsored by: The FreeBSD Foundation
| * MFC r302335: boot1.efi: fix assignment / comparison expressionemaste2016-07-251-1/+1
| | | | | | | | | | PR: 210706 Submitted by: David Binderman <dcb314@hotmail.com>
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-06-064-2/+13
|\ \ | |/
| * MFC r297147, r297148, r297149, r297150, r297151:ian2016-05-314-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make both the loader and kernel use the interface-mtu option if the dhcp server provides it. Made up of these (semi-)related changes... [kernel...] If the dhcp server provides an interface-mtu option, parse the value and set that mtu on the interface. [libstand...] Garbage collect the bswap routines from libstand, use sys/endian.h. If the dhcp server delivers an interface-mtu option, parse it and store the value in a new global intf_mtu for use by the application. [loader...] If the dhcp server provided an interface-mtu option, transcribe the value to the boot.netif.mtu env var, which will be picked up by pre-existing code in nfs_mountroot() and used to configure the interface accordingly. PR: 187094
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-05-232-1/+1
|\ \ | |/
| * MFC r299659:ngie2016-05-231-1/+0
| | | | | | | | Remove unused const variable
| * MFC r299655:ngie2016-05-231-0/+1
| | | | | | | | Add missing prototype for getchar(..)
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-05-165-11/+11
|\ \ | |/
| * MFC r298831:pfg2016-05-145-11/+11
| | | | | | | | boot/forth: minor spelling fixes.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-04-251-0/+1
|\ \ | |/
| * MFC r277205 (imp):emaste2016-04-221-0/+1
| | | | | | | | | | | | | | | | | | Reserve and ignore the a new module metadata type MDT_PNP_INFO for associating an optional PNP hint table with this module. In the future, when these are added, these changes will silently ignore the new type they would otherwise warn about. It will always be safe to ignore this data. Get this into the builds today for some future proofing.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-04-114-13/+13
|\ \ | |/
| * MFC r296769: boot/efi: Prefer nm to objdumpemaste2016-04-112-6/+6
| | | | | | | | | | | | | | | | | | Both objdump and nm are equally capable of reporting undefined symbols. This gets us a step closer to building without binutils as we have an nm implementation from ELF Tool Chain. Sponsored by: The FreeBSD Foundation
| * MFC: r292563marius2016-04-043-7/+7
| | | | | | | | | | | | | | | | loader.efi: strip trailing whitespace MFC: r293244 (remainder missing in r294275) Introduce and use new EFI_ERROR_CODE macro for EFI errors
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-03-071-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
* | 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
OpenPOWER on IntegriCloud