diff options
Diffstat (limited to 'stand/efi/loader/conf.c')
-rw-r--r-- | stand/efi/loader/conf.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c index 863c9188c72c..3bc74ea6354c 100644 --- a/stand/efi/loader/conf.c +++ b/stand/efi/loader/conf.c @@ -24,9 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <stand.h> #include <bootstrap.h> #include <efi.h> @@ -80,16 +77,25 @@ struct netif_driver *netif_drivers[] = { }; extern struct console efi_console; +extern struct console eficom; +#if defined(__aarch64__) && __FreeBSD_version < 1500000 +/* Hack for backward compatibility -- but only for a while */ +extern struct console comconsole; +#endif +#if defined(__amd64__) extern struct console comconsole; -#if defined(__amd64__) || defined(__i386__) extern struct console nullconsole; extern struct console spinconsole; #endif struct console *consoles[] = { &efi_console, + &eficom, +#if defined(__aarch64__) && __FreeBSD_version < 1500000 + &comconsole, +#endif +#if defined(__amd64__) &comconsole, -#if defined(__amd64__) || defined(__i386__) &nullconsole, &spinconsole, #endif |