Index: head/sys/boot/powerpc/uboot/Makefile
===================================================================
--- head/sys/boot/powerpc/uboot/Makefile	(revision 204314)
+++ head/sys/boot/powerpc/uboot/Makefile	(revision 204315)
@@ -1,95 +1,95 @@
 # $FreeBSD$
 
 PROG=		ubldr
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
 BINDIR?=	/boot
 INSTALLFLAGS=	-b
 NO_MAN=
 
 # Architecture-specific loader code
 SRCS=		start.S conf.c vers.c
 
-LOADER_DISK_SUPPORT?=	no
-LOADER_UFS_SUPPORT?=	no
+LOADER_DISK_SUPPORT?=	yes
+LOADER_UFS_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	no
 LOADER_EXT2FS_SUPPORT?=	no
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
 
 .if ${LOADER_DISK_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_DISK_SUPPORT
 .endif
 .if ${LOADER_UFS_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_UFS_SUPPORT
 .endif
 .if ${LOADER_CD9660_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_CD9660_SUPPORT
 .endif
 .if ${LOADER_EXT2FS_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_EXT2FS_SUPPORT
 .endif
 .if ${LOADER_GZIP_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_GZIP_SUPPORT
 .endif
 .if ${LOADER_BZIP2_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_BZIP2_SUPPORT
 .endif
 .if ${LOADER_NET_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_NET_SUPPORT
 .endif
 .if ${LOADER_NFS_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_NFS_SUPPORT
 .endif
 .if ${LOADER_TFTP_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
 
 .if !defined(NO_FORTH)
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .endif
 
 # Always add MI sources
 .PATH:		${.CURDIR}/../../common
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
 
 CLEANFILES+=	vers.c ${PROG}.help
 
 CFLAGS+=	-ffreestanding
 
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/ldscript.powerpc
 
 # Pull in common loader code
 .PATH:		${.CURDIR}/../../uboot/common
 .include	"${.CURDIR}/../../uboot/common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../uboot/common
 
 # U-Boot standalone support library
 LIBUBOOT=	${.OBJDIR}/../../uboot/lib/libuboot.a
 CFLAGS+=	-I${.CURDIR}/../../uboot/lib
 CFLAGS+=	-I${.OBJDIR}/../../uboot/lib
 
 # where to get libstand from
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
 
 DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBSTAND}
 LDADD=		${LIBFICL} ${LIBUBOOT} -lstand
 
 vers.c:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
 
-${PROG}.help: help.common help.uboot
+loader.help: help.common help.uboot
 	cat ${.ALLSRC} | \
 	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 .PATH: ${.CURDIR}/../../forth
-FILES=	${PROG}.help
+FILES=	loader.help
 
 .include <bsd.prog.mk>
Index: head/sys/boot/powerpc/uboot/conf.c
===================================================================
--- head/sys/boot/powerpc/uboot/conf.c	(revision 204314)
+++ head/sys/boot/powerpc/uboot/conf.c	(revision 204315)
@@ -1,109 +1,109 @@
 /*-
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include "bootstrap.h"
 #include "libuboot.h"
 
 #if defined(LOADER_NET_SUPPORT)
 #include "dev_net.h"
 #endif
 
 /*
  * We could use linker sets for some or all of these, but
  * then we would have to control what ended up linked into
  * the bootstrap.  So it's easier to conditionalise things
  * here.
  *
  * XXX rename these arrays to be consistent and less namespace-hostile
  */
 
 /* Exported for libstand */
 struct devsw *devsw[] = {
 #if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT)
-    &uboot_disk,
+    &uboot_storage,
 #endif
 #if defined(LOADER_NET_SUPPORT)
     &netdev,
 #endif
     NULL
 };
 
 struct fs_ops *file_system[] = {
 #if defined(LOADER_UFS_SUPPORT)
     &ufs_fsops,
 #endif
 #if defined(LOADER_CD9660_SUPPORT)
     &cd9660_fsops,
 #endif
 #if defined(LOADER_EXT2FS_SUPPORT)
     &ext2fs_fsops,
 #endif
 #if defined(LOADER_NFS_SUPPORT)
     &nfs_fsops,
 #endif
 #if defined(LOADER_TFTP_SUPPORT)
     &tftp_fsops,
 #endif
 #if defined(LOADER_GZIP_SUPPORT)
     &gzipfs_fsops,
 #endif
 #if defined(LOADER_BZIP2_SUPPORT)
     &bzipfs_fsops,
 #endif
     NULL
 };
 
 struct netif_driver *netif_drivers[] = {
 #if defined(LOADER_NET_SUPPORT)
 	&uboot_net,
 #endif
 	NULL,
 };
 
 /* Exported for PowerPC only */
 /* 
  * Sort formats so that those that can detect based on arguments
  * rather than reading the file go first.
  */
 
 struct file_format *file_formats[] = {
 	&uboot_elf,
 	NULL
 };
 
 /* 
  * Consoles 
  */
 extern struct console uboot_console;
 
 struct console *consoles[] = {
 	&uboot_console,
 	NULL
 };