diff --git a/sys/conf/files b/sys/conf/files index 4765c3bce97..a73d31e0c9e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1398,7 +1398,7 @@ dev/exca/exca.c optional cbb dev/fatm/if_fatm.c optional fatm pci dev/fb/fbd.c optional fbd | vt dev/fb/fb_if.m standard -dev/fb/splash.c optional splash +dev/fb/splash.c optional sc splash dev/fdt/fdt_common.c optional fdt dev/fdt/fdt_ic_if.m optional fdt dev/fdt/fdt_pci.c optional fdt pci @@ -2468,7 +2468,7 @@ dev/vt/font/vt_font_default.c optional vt dev/vt/font/vt_mouse_cursor.c optional vt dev/vt/hw/fb/vt_fb.c optional vt dev/vt/hw/vga/vga.c optional vt vt_vga -dev/vt/logo/logo_freebsd.c optional vt +dev/vt/logo/logo_freebsd.c optional vt splash dev/vt/vt_buf.c optional vt dev/vt/vt_consolectl.c optional vt dev/vt/vt_core.c optional vt diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index c86b1426f21..3956cfc91da 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -46,7 +46,9 @@ #include #include +#include "opt_compat.h" #include "opt_syscons.h" +#include "opt_splash.h" #ifndef VT_MAXWINDOWS #ifdef MAXCONS diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 5f81fa18f5b..c59c95ee4e5 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -794,6 +794,7 @@ vtterm_done(struct terminal *tm) } } +#ifdef DEV_SPLASH static void vtterm_splash(struct vt_device *vd) { @@ -813,6 +814,7 @@ vtterm_splash(struct vt_device *vd) vd->vd_flags |= VDF_SPLASH; } } +#endif static void vtterm_cnprobe(struct terminal *tm, struct consdev *cp) @@ -845,7 +847,9 @@ vtterm_cnprobe(struct terminal *tm, struct consdev *cp) vt_winsize(vd, vw->vw_font, &wsz); terminal_set_winsize(tm, &wsz); +#ifdef DEV_SPLASH vtterm_splash(vd); +#endif vd->vd_flags |= VDF_INITIALIZED; main_vd = vd; @@ -1788,8 +1792,10 @@ vt_allocate(struct vt_driver *drv, void *softc) /* Refill settings with new sizes. */ vt_resize(vd); +#ifdef DEV_SPLASH if (vd->vd_flags & VDF_SPLASH) vtterm_splash(vd); +#endif if (vd->vd_curwindow != NULL) callout_schedule(&vd->vd_timer, hz / VT_TIMERFREQ);