From owner-svn-src-head@FreeBSD.ORG  Thu Feb 25 15:21:38 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F0287106566B;
	Thu, 25 Feb 2010 15:21:37 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DF3568FC0A;
	Thu, 25 Feb 2010 15:21:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PFLbKY050089;
	Thu, 25 Feb 2010 15:21:37 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1PFLb6K050086;
	Thu, 25 Feb 2010 15:21:37 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <201002251521.o1PFLb6K050086@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Thu, 25 Feb 2010 15:21:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204315 - head/sys/boot/powerpc/uboot
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2010 15:21:38 -0000

Author: raj
Date: Thu Feb 25 15:21:37 2010
New Revision: 204315
URL: http://svn.freebsd.org/changeset/base/204315

Log:
  Enable U-Boot storage for PowerPC. While there fix loader(8) help file name.
  
  MFC after:	1 week

Modified:
  head/sys/boot/powerpc/uboot/Makefile
  head/sys/boot/powerpc/uboot/conf.c

Modified: head/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- head/sys/boot/powerpc/uboot/Makefile	Thu Feb 25 15:03:57 2010	(r204314)
+++ head/sys/boot/powerpc/uboot/Makefile	Thu Feb 25 15:21:37 2010	(r204315)
@@ -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>

Modified: head/sys/boot/powerpc/uboot/conf.c
==============================================================================
--- head/sys/boot/powerpc/uboot/conf.c	Thu Feb 25 15:03:57 2010	(r204314)
+++ head/sys/boot/powerpc/uboot/conf.c	Thu Feb 25 15:21:37 2010	(r204315)
@@ -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,