summaryrefslogtreecommitdiffstats
path: root/sys/boot/powerpc
diff options
context:
space:
mode:
authorraj <raj@FreeBSD.org>2010-02-25 15:21:37 +0000
committerraj <raj@FreeBSD.org>2010-02-25 15:21:37 +0000
commit35653f8771f7726774f64c16dc8d007a14d68a1c (patch)
tree83da96232e2dfdc98b6e612c4fe49ec23894836d /sys/boot/powerpc
parent709c06294da96cfbb2cc4c2829069bdf22328734 (diff)
downloadFreeBSD-src-35653f8771f7726774f64c16dc8d007a14d68a1c.zip
FreeBSD-src-35653f8771f7726774f64c16dc8d007a14d68a1c.tar.gz
Enable U-Boot storage for PowerPC. While there fix loader(8) help file name.
MFC after: 1 week
Diffstat (limited to 'sys/boot/powerpc')
-rw-r--r--sys/boot/powerpc/uboot/Makefile8
-rw-r--r--sys/boot/powerpc/uboot/conf.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/boot/powerpc/uboot/Makefile b/sys/boot/powerpc/uboot/Makefile
index efb401e..62a2868 100644
--- a/sys/boot/powerpc/uboot/Makefile
+++ b/sys/boot/powerpc/uboot/Makefile
@@ -9,8 +9,8 @@ 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
@@ -85,11 +85,11 @@ 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>
diff --git a/sys/boot/powerpc/uboot/conf.c b/sys/boot/powerpc/uboot/conf.c
index 5a9515a..3530537 100644
--- a/sys/boot/powerpc/uboot/conf.c
+++ b/sys/boot/powerpc/uboot/conf.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
/* 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,
OpenPOWER on IntegriCloud