diff --git a/wally-pipelined/linux-testgen/buildroot-config-src/linux.config b/wally-pipelined/linux-testgen/buildroot-config-src/linux.config
index 7ec83e7ee..88873a106 100644
--- a/wally-pipelined/linux-testgen/buildroot-config-src/linux.config
+++ b/wally-pipelined/linux-testgen/buildroot-config-src/linux.config
@@ -230,7 +230,7 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-CONFIG_RISCV_SBI_V01=y
+# CONFIG_RISCV_SBI_V01 is not set
 # end of Kernel features
 
 #
@@ -659,7 +659,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
@@ -682,7 +681,6 @@ CONFIG_SERIAL_SIFIVE_CONSOLE=y
 # CONFIG_NULL_TTY is not set
 # CONFIG_TRACE_SINK is not set
 CONFIG_HVC_DRIVER=y
-CONFIG_HVC_RISCV_SBI=y
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_VIRTIO_CONSOLE=y