Index: boot/Makefile.silo
===================================================================
--- boot/Makefile.silo	(revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d)
+++ boot/Makefile.silo	(revision 3f08fd2b9072227f3006fed60b75c6f38e7ac5d9)
@@ -31,9 +31,5 @@
 include Makefile.common
 
-ifeq ($(CONFIG_AOUT_ISOFS_B),y)
-	SILO_PACKAGE = a.out
-else
-	SILO_PACKAGE = raw
-endif
+SILO_PACKAGE = a.out
 
 ISOFS_B = silo/$(SILO_PACKAGE)/isofs.b
Index: boot/arch/sparc64/Makefile.inc
===================================================================
--- boot/arch/sparc64/Makefile.inc	(revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d)
+++ boot/arch/sparc64/Makefile.inc	(revision 3f08fd2b9072227f3006fed60b75c6f38e7ac5d9)
@@ -43,5 +43,4 @@
 
 RD_SRVS_ESSENTIAL += \
-	$(USPACE_PATH)/srv/hw/irc/fhc/fhc \
 	$(USPACE_PATH)/srv/hw/irc/obio/obio
 
Index: boot/arch/sparc64/src/main.c
===================================================================
--- boot/arch/sparc64/src/main.c	(revision 2429e4a21037762ab4104bb2ea7d71156b2fbf0d)
+++ boot/arch/sparc64/src/main.c	(revision 3f08fd2b9072227f3006fed60b75c6f38e7ac5d9)
@@ -182,8 +182,5 @@
 	 * of the "/memory" node to find out which parts of memory
 	 * are used by OBP and redesign the algorithm of copying
-	 * kernel/init tasks/ramdisk from the bootable image to memory
-	 * (which we must do anyway because of issues with claiming the memory
-	 * on Serengeti).
-	 *
+	 * kernel/init tasks/ramdisk from the bootable image to memory.
 	 */
 	bootinfo.physmem_start += OBP_BIAS;