Date: Thu, 4 Mar 2010 20:03:26 +0000 (UTC) From: Rafal Jaworowski <raj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r204727 - stable/8/sys/boot/powerpc/uboot Message-ID: <201003042003.o24K3QEv074409@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: raj Date: Thu Mar 4 20:03:26 2010 New Revision: 204727 URL: http://svn.freebsd.org/changeset/base/204727 Log: MFC r204315 Enable U-Boot storage for PowerPC. While there fix loader(8) help file name. Modified: stable/8/sys/boot/powerpc/uboot/Makefile stable/8/sys/boot/powerpc/uboot/conf.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/netinet/ (props changed) Modified: stable/8/sys/boot/powerpc/uboot/Makefile ============================================================================== --- stable/8/sys/boot/powerpc/uboot/Makefile Thu Mar 4 19:56:08 2010 (r204726) +++ stable/8/sys/boot/powerpc/uboot/Makefile Thu Mar 4 20:03:26 2010 (r204727) @@ -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: stable/8/sys/boot/powerpc/uboot/conf.c ============================================================================== --- stable/8/sys/boot/powerpc/uboot/conf.c Thu Mar 4 19:56:08 2010 (r204726) +++ stable/8/sys/boot/powerpc/uboot/conf.c Thu Mar 4 20:03:26 2010 (r204727) @@ -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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003042003.o24K3QEv074409>