git: 10c429016a3c - main - stand: Ugly hack due to default change
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 28 Oct 2024 19:51:59 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=10c429016a3c5adf2e04cfd1ac97eb24c0e7074c
commit 10c429016a3c5adf2e04cfd1ac97eb24c0e7074c
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-10-28 16:50:29 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-10-28 19:51:53 +0000
stand: Ugly hack due to default change
So this is a gross hack to fix the 'noclean' build since we changed to
text-only loader. We have to fix it in a better way, but for the moment,
this will fix non-meta no-clean builds. A better hack is to fix this so
we build either vidconsole.c or textvidc.c, but some minor refactoring
and variable renaming is needed.
Fixes: 23dee252daf2
Sponsored by: Netflix
---
stand/i386/loader/conf.c | 2 +-
stand/i386/loader/gfx_bios.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c
index 622812efbb51..bba33a2707d5 100644
--- a/stand/i386/loader/conf.c
+++ b/stand/i386/loader/conf.c
@@ -134,7 +134,7 @@ extern struct console nullconsole;
extern struct console spinconsole;
struct console *consoles[] = {
-#ifdef BIOS_TEXT_ONLY
+#ifdef BIOS_TEXT_ONLY /* Note: We need a forced commit for this */
&textvidc,
#else
&vidconsole,
diff --git a/stand/i386/loader/gfx_bios.c b/stand/i386/loader/gfx_bios.c
index a0b08a7cbcde..1581325a81e0 100644
--- a/stand/i386/loader/gfx_bios.c
+++ b/stand/i386/loader/gfx_bios.c
@@ -22,7 +22,7 @@
#include <gfx_fb.h>
#endif
-#ifdef BIOS_TEXT_ONLY
+#ifdef BIOS_TEXT_ONLY /* Note: likely need a forced commits when this changes */
void autoload_font(bool bios);
void