diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -165,7 +165,7 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -# options EARLY_PRINTF +# options EARLY_PRINTF=sbi options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. diff --git a/sys/riscv/riscv/riscv_console.c b/sys/riscv/riscv/riscv_console.c --- a/sys/riscv/riscv/riscv_console.c +++ b/sys/riscv/riscv/riscv_console.c @@ -110,7 +110,7 @@ sbi_console_putchar(c); } -#ifdef EARLY_PRINTF +#if CHECK_EARLY_PRINTF(sbi) early_putc_t *early_putc = riscv_putc; #endif diff --git a/sys/sys/systm.h b/sys/sys/systm.h --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -215,6 +215,7 @@ #define early_printf_ns8250 3 #define early_printf_pl011 4 #define early_printf_snps 5 +#define early_printf_sbi 6 #else #define CHECK_EARLY_PRINTF(x) 0 #endif