Instead of "OpenFirmware", "openfirmware", etc. use the official spelling

"Open Firmware" from IEEE 1275 and OpenFirmware.org (no pun intended).

Ok'ed by:	tmm

17 files changed, 22 insertions, 22 deletions

diff --git a/sys/powerpc/aim/locore.S b/sys/powerpc/aim/locore.S
index fb12deaf53aa..53ff043a5dd2 100644
--- a/sys/powerpc/aim/locore.S
+++ b/sys/powerpc/aim/locore.S
@@ -102,7 +102,7 @@ GLOBAL(eintrcnt)
 idle_u:
 	.long	0			/* fake uarea during idle after exit */
 openfirmware_entry:
-	.long	0			/* openfirmware entry point */
+	.long	0			/* Open Firmware entry point */
 srsave:
 	.long	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index 08d727559612..87be1ce7cebf 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -689,7 +689,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend)
 	pmap_vsid_bitmap[0] |= 1;
 
 	/*
-	 * Set up the OpenFirmware pmap and add it's mappings.
+	 * Set up the Open Firmware pmap and add it's mappings.
 	 */
 	pmap_pinit(&ofw_pmap);
 	ofw_pmap.pm_sr[KERNEL_SR] = KERNEL_SEGMENT;
diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/aim/nexus.c
index bed24d6ec94c..0df66db56e7b 100644
--- a/sys/powerpc/aim/nexus.c
+++ b/sys/powerpc/aim/nexus.c
@@ -78,11 +78,11 @@
 
 /*
  * The nexus (which is a pseudo-bus actually) iterates over the nodes that
- * exist in OpenFirmware and adds them as devices to this bus so that drivers
+ * exist in Open Firmware and adds them as devices to this bus so that drivers
  * can be attached to them.
  *
  * Maybe this code should get into dev/ofw to some extent, as some of it should
- * work for all OpenFirmware based machines...
+ * work for all Open Firmware based machines...
  */
 
 static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information");
@@ -190,7 +190,7 @@ nexus_probe(device_t dev)
 		(void)nexus_device_from_node(dev, child);
 
 	}
-	device_set_desc(dev, "OpenFirmware Nexus device");
+	device_set_desc(dev, "Open Firmware Nexus device");
 	return (0);
 }
 
diff --git a/sys/powerpc/aim/ofw_machdep.c b/sys/powerpc/aim/ofw_machdep.c
index c00ca8695d7b..876f88509e3c 100644
--- a/sys/powerpc/aim/ofw_machdep.c
+++ b/sys/powerpc/aim/ofw_machdep.c
@@ -178,7 +178,7 @@ openfirmware(void *args)
 
 	if (pmap_bootstrapped) {
 		/*
-		 * Swap the kernel's address space with OpenFirmware's
+		 * Swap the kernel's address space with Open Firmware's
 		 */
 		for (i = 0; i < 16; i++) {
 			srsave[i] = mfsrin(i << ADDR_SR_SHFT);
diff --git a/sys/powerpc/aim/ofwmagic.S b/sys/powerpc/aim/ofwmagic.S
index 033a5fe98348..55af6d254440 100644
--- a/sys/powerpc/aim/ofwmagic.S
+++ b/sys/powerpc/aim/ofwmagic.S
@@ -38,7 +38,7 @@
  */
 
 /*
- * Magic note section used by OpenFirmware.
+ * Magic note section used by Open Firmware.
  */
 
 	.section ".note"
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index bbd5ca35621b..35eec94ffe98 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -111,7 +111,7 @@ device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
-device		ofwd		# OpenFirmware disks
+device		ofwd		# Open Firmware disks
 device		gif		# IPv6 and IPv4 tunneling
 device		faith		# IPv6-to-IPv4 relaying/(translation)
 
diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c
index 6cf5cb871556..6307d050a671 100644
--- a/sys/powerpc/ofw/ofw_pcib_pci.c
+++ b/sys/powerpc/ofw/ofw_pcib_pci.c
@@ -95,7 +95,7 @@ ofw_pcib_pci_probe(device_t dev)
 		return (ENXIO);
 	}
 
-	device_set_desc(dev, "OpenFirmware PCI-PCI bridge");
+	device_set_desc(dev, "Open Firmware PCI-PCI bridge");
 	return (-1000);
 }
 
diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c
index 47d8115bf360..655809579fd0 100644
--- a/sys/powerpc/powermac/ata_kauai.c
+++ b/sys/powerpc/powermac/ata_kauai.c
@@ -141,7 +141,7 @@ ata_kauai_probe(device_t dev)
 	 * This device seems to ignore writes to the interrupt
 	 * config register, resulting in interrupt resources
 	 * not being attached. If this is the case, use
-	 * OpenFirmware to determine the irq, and then attach
+	 * Open Firmware to determine the irq, and then attach
 	 * the resource. This allows the ATA common code to
 	 * allocate the irq.
 	 */
diff --git a/sys/powerpc/powermac/hrowpic.c b/sys/powerpc/powermac/hrowpic.c
index 0c1fd4b5986d..3c657d8e9be2 100644
--- a/sys/powerpc/powermac/hrowpic.c
+++ b/sys/powerpc/powermac/hrowpic.c
@@ -32,7 +32,7 @@
  * This was superseded by an OpenPIC in the Keylargo and beyond 
  * MacIO versions.
  *
- *  The device is initially located in the OpenFirmware device tree
+ *  The device is initially located in the Open Firmware device tree
  * in the earliest stage of the nexus probe. However, no device registers
  * are touched until the actual h/w is probed later on during the
  * MacIO probe. At that point, any interrupt sources that were allocated 
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index 1bf007d7cdf6..0bc7a71a6107 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -243,7 +243,7 @@ macio_probe(device_t dev)
 }
 
 /*
- * PCI attach: scan OpenFirmware child nodes, and attach these as children
+ * PCI attach: scan Open Firmware child nodes, and attach these as children
  * of the macio bus
  */
 static int 
diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c
index c609a0058677..1eca880fa1b0 100644
--- a/sys/powerpc/powermac/uninorth.c
+++ b/sys/powerpc/powermac/uninorth.c
@@ -230,8 +230,8 @@ uninorth_attach(device_t dev)
 	}
 
 	/*
-	 * Enable the GMAC ethernet cell if OpenFirmware says it is
-	 * used
+	 * Enable the GMAC Ethernet cell if Open Firmware says it is
+	 * used.
 	 */
 	for (child = OF_child(node); child; child = OF_peer(child)) {
 		char compat[32];
diff --git a/sys/powerpc/powerpc/locore.S b/sys/powerpc/powerpc/locore.S
index fb12deaf53aa..53ff043a5dd2 100644
--- a/sys/powerpc/powerpc/locore.S
+++ b/sys/powerpc/powerpc/locore.S
@@ -102,7 +102,7 @@ GLOBAL(eintrcnt)
 idle_u:
 	.long	0			/* fake uarea during idle after exit */
 openfirmware_entry:
-	.long	0			/* openfirmware entry point */
+	.long	0			/* Open Firmware entry point */
 srsave:
 	.long	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 
diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c
index 08d727559612..87be1ce7cebf 100644
--- a/sys/powerpc/powerpc/mmu_oea.c
+++ b/sys/powerpc/powerpc/mmu_oea.c
@@ -689,7 +689,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend)
 	pmap_vsid_bitmap[0] |= 1;
 
 	/*
-	 * Set up the OpenFirmware pmap and add it's mappings.
+	 * Set up the Open Firmware pmap and add it's mappings.
 	 */
 	pmap_pinit(&ofw_pmap);
 	ofw_pmap.pm_sr[KERNEL_SR] = KERNEL_SEGMENT;
diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c
index bed24d6ec94c..0df66db56e7b 100644
--- a/sys/powerpc/powerpc/nexus.c
+++ b/sys/powerpc/powerpc/nexus.c
@@ -78,11 +78,11 @@
 
 /*
  * The nexus (which is a pseudo-bus actually) iterates over the nodes that
- * exist in OpenFirmware and adds them as devices to this bus so that drivers
+ * exist in Open Firmware and adds them as devices to this bus so that drivers
  * can be attached to them.
  *
  * Maybe this code should get into dev/ofw to some extent, as some of it should
- * work for all OpenFirmware based machines...
+ * work for all Open Firmware based machines...
  */
 
 static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information");
@@ -190,7 +190,7 @@ nexus_probe(device_t dev)
 		(void)nexus_device_from_node(dev, child);
 
 	}
-	device_set_desc(dev, "OpenFirmware Nexus device");
+	device_set_desc(dev, "Open Firmware Nexus device");
 	return (0);
 }
 
diff --git a/sys/powerpc/powerpc/ofw_machdep.c b/sys/powerpc/powerpc/ofw_machdep.c
index c00ca8695d7b..876f88509e3c 100644
--- a/sys/powerpc/powerpc/ofw_machdep.c
+++ b/sys/powerpc/powerpc/ofw_machdep.c
@@ -178,7 +178,7 @@ openfirmware(void *args)
 
 	if (pmap_bootstrapped) {
 		/*
-		 * Swap the kernel's address space with OpenFirmware's
+		 * Swap the kernel's address space with Open Firmware's
 		 */
 		for (i = 0; i < 16; i++) {
 			srsave[i] = mfsrin(i << ADDR_SR_SHFT);
diff --git a/sys/powerpc/powerpc/ofwmagic.S b/sys/powerpc/powerpc/ofwmagic.S
index 033a5fe98348..55af6d254440 100644
--- a/sys/powerpc/powerpc/ofwmagic.S
+++ b/sys/powerpc/powerpc/ofwmagic.S
@@ -38,7 +38,7 @@
  */
 
 /*
- * Magic note section used by OpenFirmware.
+ * Magic note section used by Open Firmware.
  */
 
 	.section ".note"
diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c
index 08d727559612..87be1ce7cebf 100644
--- a/sys/powerpc/powerpc/pmap.c
+++ b/sys/powerpc/powerpc/pmap.c
@@ -689,7 +689,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend)
 	pmap_vsid_bitmap[0] |= 1;
 
 	/*
-	 * Set up the OpenFirmware pmap and add it's mappings.
+	 * Set up the Open Firmware pmap and add it's mappings.
 	 */
 	pmap_pinit(&ofw_pmap);
 	ofw_pmap.pm_sr[KERNEL_SR] = KERNEL_SEGMENT;