Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
+++ HelenOS.config	(revision 97b8ca970e38244c08a9fa57840bd46ae9acfb8f)
@@ -39,5 +39,4 @@
 @ "ppc32" PowerPC 32-bit
 @ "riscv64" RISC-V 64-bit
-@ "sparc32" SPARCv8 32-bit
 @ "sparc64" SPARCv9 64-bit
 ! PLATFORM (choice)
@@ -57,8 +56,4 @@
 @ "generic" Generic Sun workstation or server
 ! [PLATFORM=sparc64] MACHINE (choice)
-
-% Machine type
-@ "leon3" Gaisler Aeroflex LEON3
-! [PLATFORM=sparc32] MACHINE (choice)
 
 % Machine type
@@ -84,8 +79,4 @@
 
 % CPU type
-@ "leon3" Gaisler Aeroflex LEON3
-! [PLATFORM=sparc32&MACHINE=leon3] PROCESSOR (choice)
-
-% CPU type
 @ "us" UltraSPARC I-II subarchitecture
 @ "us3" UltraSPARC III-IV subarchitecture
@@ -192,8 +183,4 @@
 
 % Kernel architecture
-@ "sparc32"
-! [PLATFORM=sparc32] KARCH (choice)
-
-% Kernel architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] KARCH (choice)
@@ -243,8 +230,4 @@
 
 % User space architecture
-@ "sparc32"
-! [PLATFORM=sparc32] UARCH (choice)
-
-% User space architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] UARCH (choice)
@@ -292,8 +275,4 @@
 @ "riscv64"
 ! [PLATFORM=riscv64] BARCH (choice)
-
-% Boot architecture
-@ "sparc32"
-! [PLATFORM=sparc32] BARCH (choice)
 
 % Boot architecture
@@ -334,5 +313,5 @@
 @ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=riscv64|PLATFORM=sparc32] COMPILER (choice)
+! [PLATFORM=riscv64] COMPILER (choice)
 
 % Compiler
@@ -368,5 +347,5 @@
 
 % IOMAP dummy support
-! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32|PLATFORM=sparc64] CONFIG_IOMAP_DUMMY (y)
+! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_IOMAP_DUMMY (y)
 
 % ACPI support
@@ -374,5 +353,5 @@
 
 % Hierarchical page tables support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc32] CONFIG_PAGE_PT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64] CONFIG_PAGE_PT (y)
 
 % Page hash table support
@@ -380,11 +359,11 @@
 
 % Software integer division support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32] CONFIG_SOFTINT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
 
 % ASID support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32|PLATFORM=sparc64] CONFIG_ASID (y)
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
 
 % ASID FIFO support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
 
 % OpenFirmware tree support
@@ -545,10 +524,4 @@
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
 
-% Support for GRLIB UART
-! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_UART (y)
-
-% Support for GRLIB IRQMP
-! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_IRQMP (y)
-
 % Support for BCM2835 mailbox
 ! [PLATFORM=arm32&MACHINE=raspberrypi] CONFIG_BCM2835_MAILBOX (y/n)
@@ -573,5 +546,5 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=sparc32)|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_PL011_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)|(PLATFORM=arm32&MACHINE=raspberrypi&CONFIG_PL011_UART=y)|(PLATFORM=ia32&CONFIG_NS16550=y)|(PLATFORM=amd64&CONFIG_NS16550=y)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_PL011_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)|(PLATFORM=arm32&MACHINE=raspberrypi&CONFIG_PL011_UART=y)|(PLATFORM=ia32&CONFIG_NS16550=y)|(PLATFORM=amd64&CONFIG_NS16550=y)] CONFIG_SRLN (y)
 
 % EGA support
@@ -680,6 +653,2 @@
 @ "5" Linux kernel
 ! [PLATFORM=arm32&MACHINE!=beagleboardxm&MACHINE!=beaglebone] UIMAGE_OS (choice)
-
-% uImage OS type
-@ "5" Linux kernel
-! [PLATFORM=sparc32] UIMAGE_OS (choice)