Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 114d0985f3fe419a2b8ff52eec41300416613cfc)
+++ HelenOS.config	(revision 7a674165a6fe89026b91266eaab051a565eabcae)
@@ -38,4 +38,5 @@
 @ "mips32" MIPS 32-bit
 @ "ppc32" PowerPC 32-bit
+@ "riscv64" RISC-V 64-bit
 @ "sparc32" SPARCv8 32-bit
 @ "sparc64" SPARCv9 64-bit
@@ -182,4 +183,8 @@
 
 % Kernel architecture
+@ "riscv64"
+! [PLATFORM=riscv64] KARCH (choice)
+
+% Kernel architecture
 @ "sparc32"
 ! [PLATFORM=sparc32] KARCH (choice)
@@ -229,4 +234,8 @@
 
 % User space architecture
+@ "riscv64"
+! [PLATFORM=riscv64] UARCH (choice)
+
+% User space architecture
 @ "sparc32"
 ! [PLATFORM=sparc32] UARCH (choice)
@@ -274,4 +283,8 @@
 @ "ppc64"
 ! [PLATFORM=ppc64] BARCH (choice)
+
+% Boot architecture
+@ "riscv64"
+! [PLATFORM=riscv64] BARCH (choice)
 
 % Boot architecture
@@ -316,5 +329,5 @@
 @ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=sparc32] COMPILER (choice)
+! [PLATFORM=riscv64|PLATFORM=sparc32] COMPILER (choice)
 
 % Compiler
@@ -356,5 +369,5 @@
 
 % Hierarchical page tables support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32] CONFIG_PAGE_PT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc32] CONFIG_PAGE_PT (y)
 
 % Page hash table support
@@ -461,5 +474,5 @@
 @ "generic" Keyboard or serial line
 @ "none" No input device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_HID_IN (choice)
 
 % Input device class
@@ -477,5 +490,5 @@
 @ "generic" Monitor or serial line
 @ "none" No output device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=bmalta|MACHINE=lmalta))] CONFIG_HID_OUT (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=bmalta|MACHINE=lmalta))|PLATFORM=riscv64] CONFIG_HID_OUT (choice)
 
 % PC keyboard support
@@ -602,5 +615,5 @@
 % Dynamic linking support
 ! [PLATFORM=ia32] CONFIG_RTLD (n/y)
-! [PLATFORM=abs32le|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_RTLD (n)
+! [PLATFORM=abs32le|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_RTLD (n)
 
 % Build shared libraries