diff --git a/configs/fedora/generic/riscv/CONFIG_CMDLINE b/configs/fedora/generic/riscv/CONFIG_CMDLINE
new file mode 100644
index 000000000..f3083e1e5
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_CMDLINE
@@ -0,0 +1 @@
+CONFIG_CMDLINE=""
diff --git a/configs/fedora/generic/riscv/CONFIG_SERIAL_EARLYCON_RISCV_SBI b/configs/fedora/generic/riscv/CONFIG_SERIAL_EARLYCON_RISCV_SBI
new file mode 100644
index 000000000..b48d7b11e
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_SERIAL_EARLYCON_RISCV_SBI
@@ -0,0 +1 @@
+CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config
index adf361b08..062fb02d7 100644
--- a/kernel-riscv64-debug.config
+++ b/kernel-riscv64-debug.config
@@ -714,6 +714,7 @@ CONFIG_CM32181=m
 CONFIG_CM3605=m
 # CONFIG_CM36651 is not set
 # CONFIG_CMA is not set
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMODEL_MEDANY=y
@@ -4506,6 +4507,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_JSM=m
diff --git a/kernel-riscv64.config b/kernel-riscv64.config
index feb137cfb..c5d5eda7f 100644
--- a/kernel-riscv64.config
+++ b/kernel-riscv64.config
@@ -713,6 +713,7 @@ CONFIG_CM32181=m
 CONFIG_CM3605=m
 # CONFIG_CM36651 is not set
 # CONFIG_CMA is not set
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMODEL_MEDANY=y
@@ -4484,6 +4485,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_JSM=m