From 456ff079c00db2be8130deba3f8d9d6262bbeecd Mon Sep 17 00:00:00 2001
From: Peter Grehan <grehan@FreeBSD.org>
Date: Wed, 10 Dec 2003 09:17:01 +0000
Subject: [PATCH] Update libstand filesystems to be in-line with tier-1
 platforms.

---
 sys/boot/powerpc/loader/conf.c | 20 ++++++++++++++------
 sys/boot/powerpc/ofw/conf.c    | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/sys/boot/powerpc/loader/conf.c b/sys/boot/powerpc/loader/conf.c
index 95e6bc6bdc6..22027b617fb 100644
--- a/sys/boot/powerpc/loader/conf.c
+++ b/sys/boot/powerpc/loader/conf.c
@@ -46,7 +46,7 @@
 
 /* Exported for libstand */
 struct devsw *devsw[] = {
-#if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CDROM_SUPPORT)
+#if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT)
     &ofwdisk,
 #endif
 #if defined(LOADER_NET_SUPPORT)
@@ -56,24 +56,32 @@ struct devsw *devsw[] = {
 };
 
 struct fs_ops *file_system[] = {
-#ifdef LOADER_UFS_SUPPORT
+#if defined(LOADER_UFS_SUPPORT)
     &ufs_fsops,
 #endif
-#ifdef LOADER_CDROM_SUPPORT
+#if defined(LOADER_CD9660_SUPPORT)
     &cd9660_fsops,
 #endif
-#ifdef LOADER_EXT2FS_SUPPORT
+#if defined(LOADER_EXT2FS_SUPPORT)
     &ext2fs_fsops,
 #endif
-#ifdef LOADER_NET_SUPPORT
+#if defined(LOADER_NET_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[] = {
-#ifdef LOADER_NET_SUPPORT
+#if defined(LOADER_NET_SUPPORT)
 	&ofwnet,
 #endif
 	NULL,
diff --git a/sys/boot/powerpc/ofw/conf.c b/sys/boot/powerpc/ofw/conf.c
index 95e6bc6bdc6..22027b617fb 100644
--- a/sys/boot/powerpc/ofw/conf.c
+++ b/sys/boot/powerpc/ofw/conf.c
@@ -46,7 +46,7 @@
 
 /* Exported for libstand */
 struct devsw *devsw[] = {
-#if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CDROM_SUPPORT)
+#if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT)
     &ofwdisk,
 #endif
 #if defined(LOADER_NET_SUPPORT)
@@ -56,24 +56,32 @@ struct devsw *devsw[] = {
 };
 
 struct fs_ops *file_system[] = {
-#ifdef LOADER_UFS_SUPPORT
+#if defined(LOADER_UFS_SUPPORT)
     &ufs_fsops,
 #endif
-#ifdef LOADER_CDROM_SUPPORT
+#if defined(LOADER_CD9660_SUPPORT)
     &cd9660_fsops,
 #endif
-#ifdef LOADER_EXT2FS_SUPPORT
+#if defined(LOADER_EXT2FS_SUPPORT)
     &ext2fs_fsops,
 #endif
-#ifdef LOADER_NET_SUPPORT
+#if defined(LOADER_NET_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[] = {
-#ifdef LOADER_NET_SUPPORT
+#if defined(LOADER_NET_SUPPORT)
 	&ofwnet,
 #endif
 	NULL,