Page MenuHomeFreeBSD
Files F133883601

D26829.id78347.diff
No OneTemporary
Actions

D26829.id78347.diff
View Options

Index: stand/efi/loader/arch/arm/Makefile.inc
===================================================================
--- stand/efi/loader/arch/arm/Makefile.inc
+++ stand/efi/loader/arch/arm/Makefile.inc
@@ -4,4 +4,7 @@
efiserialio.c \
start.S
+.PATH: ${BOOTSRC}/i386/libi386
+SRCS+= nullconsole.c
+
HAVE_FDT=yes
Index: stand/efi/loader/arch/arm64/Makefile.inc
===================================================================
--- stand/efi/loader/arch/arm64/Makefile.inc
+++ stand/efi/loader/arch/arm64/Makefile.inc
@@ -6,6 +6,9 @@
efiserialio.c \
start.S
+.PATH: ${BOOTSRC}/i386/libi386
+SRCS+= nullconsole.c
+
.PATH: ${BOOTSRC}/arm64/libarm64
CFLAGS+=-I${BOOTSRC}/arm64/libarm64
SRCS+= cache.c
Index: stand/efi/loader/conf.c
===================================================================
--- stand/efi/loader/conf.c
+++ stand/efi/loader/conf.c
@@ -74,16 +74,20 @@
extern struct console efi_console;
extern struct console comconsole;
-#if defined(__amd64__) || defined(__i386__)
+#if !defined(__riscv)
extern struct console nullconsole;
+#endif
+#if defined(__amd64__) || defined(__i386__)
extern struct console spinconsole;
#endif
struct console *consoles[] = {
&efi_console,
&comconsole,
-#if defined(__amd64__) || defined(__i386__)
+#if !defined(__riscv)
&nullconsole,
+#endif
+#if defined(__amd64__) || defined(__i386__)
&spinconsole,
#endif
NULL
Index: stand/efi/loader/main.c
===================================================================
--- stand/efi/loader/main.c
+++ stand/efi/loader/main.c
@@ -697,7 +697,7 @@
* method is flawed for non-ASCII characters).
*/
howto = 0;
- for (i = 1; i < argc; i++) {
+ for (i = 0; i < argc; i++) {
cpy16to8(argv[i], var, sizeof(var));
howto |= boot_parse_arg(var);
}
@@ -928,6 +928,11 @@
if ((uhowto & RB_SERIAL) != 0)
setenv("console", "comconsole", 1);
#endif
+
+ howto = parse_args(argc, argv);
+ if ((howto & RB_MUTE) != 0)
+ setenv("console", "nullconsole", 1);
+
cons_probe();
/* Init the time source */
@@ -957,7 +962,6 @@
* args (eg -h) or via the UEFI ConOut variable.
*/
has_kbd = has_keyboard();
- howto = parse_args(argc, argv);
if (!has_kbd && (howto & RB_PROBE))
howto |= RB_SERIAL | RB_MULTIPLE;
howto &= ~RB_PROBE;

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 30, 4:28 AM (11 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24440060
Default Alt Text
D26829.id78347.diff (2 KB)

Event Timeline