diff --git a/xCAT-genesis-builder/oe/meta-xcat-genesis/recipes-kernel/linux/linux-yocto/xcat-genesis-riscv64.cfg b/xCAT-genesis-builder/oe/meta-xcat-genesis/recipes-kernel/linux/linux-yocto/xcat-genesis-riscv64.cfg
index 46012a843..91f988126 100644
--- a/xCAT-genesis-builder/oe/meta-xcat-genesis/recipes-kernel/linux/linux-yocto/xcat-genesis-riscv64.cfg
+++ b/xCAT-genesis-builder/oe/meta-xcat-genesis/recipes-kernel/linux/linux-yocto/xcat-genesis-riscv64.cfg
@@ -7,6 +7,13 @@ CONFIG_RISCV_SBI=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 
+# Firmware description
+CONFIG_ACPI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+
 # Loadable service drivers
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
diff --git a/xCAT-test/unit/genesis_openembedded.t b/xCAT-test/unit/genesis_openembedded.t
index efd157379..368f5c7ab 100644
--- a/xCAT-test/unit/genesis_openembedded.t
+++ b/xCAT-test/unit/genesis_openembedded.t
@@ -548,6 +548,17 @@ for my $symbol (
         "riscv64 kernel enables $symbol" );
 }
 
+for my $symbol (
+    qw(
+      CONFIG_ACPI CONFIG_ACPI_APEI CONFIG_ACPI_APEI_GHES
+      CONFIG_EFI CONFIG_EFI_STUB
+    )
+  )
+{
+    like( $riscv64_kernel_config, qr/^\Q$symbol\E=[ym]$/m,
+        "riscv64 kernel enables $symbol to boot on ACPI firmware" );
+}
+
 my $powerpc64_kernel_config = read_file(
     'xCAT-genesis-builder/oe/meta-xcat-genesis/recipes-kernel/linux/linux-yocto/xcat-genesis-powerpc64.cfg'
 );