diff options
| author | emaste <emaste@FreeBSD.org> | 2014-09-02 22:01:14 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-09-02 22:01:14 +0000 |
| commit | 63a3fa9dd01a9f60382de27d62550a7fdcfb0659 (patch) | |
| tree | 04d481eaf7cd8b86629e0e4335e0ae58b04046e3 /sys/amd64 | |
| parent | ad2653d85efb9e1ad4b671687bcf5e3d6b9d3d06 (diff) | |
| download | FreeBSD-src-63a3fa9dd01a9f60382de27d62550a7fdcfb0659.zip FreeBSD-src-63a3fa9dd01a9f60382de27d62550a7fdcfb0659.tar.gz | |
MFC automatic vt(4) selection for UEFI boot
r268158: Prefer vt(4) for UEFI boot
The UEFI framebuffer driver vt_efifb requires vt(4), so add a
mechanism for the startup routine to set the preferred console.
This change is ugly because console init happens very early in the
boot, making a cleaner interface difficult. This change is intended
only to facilitate the sc(4) / vt(4) transition, and can be reverted
once vt(4) is the default.
r268160: Fix typos in VTY constant names from r268158
r268982: Don't pass null kmdp to preload_search_info
On Xen PVH guests kmdp == NULL.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index df26e7e..4fefcb5 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1909,6 +1909,14 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) i8254_init(); /* + * Use vt(4) by default for UEFI boot (during the sc(4)/vt(4) + * transition). + */ + if (kmdp != NULL && preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_EFI_MAP) != NULL) + vty_set_preferred(VTY_VT); + + /* * Initialize the console before we print anything out. */ cninit(); |
