diff --git a/plat/osx/cvmach/cvmach.c b/plat/osx/cvmach/cvmach.c
index 12a48696d..f223fa6f7 100644
--- a/plat/osx/cvmach/cvmach.c
+++ b/plat/osx/cvmach/cvmach.c
@@ -115,13 +115,13 @@ uint32_t align(uint32_t a, uint32_t b)
 	a += b - 1;
 	return a & ~(b-1);
 }
- 
+
 
 /* Writes out a 32-bit value in the appropriate endianness. */
 void emit32(uint32_t value)
 {
 	unsigned char buffer[4];
-	
+
 	if (bigendian)
 	{
 		buffer[0] = (value >> 24) & 0xFF;
@@ -136,7 +136,7 @@ void emit32(uint32_t value)
 		buffer[1] = (value >>  8) & 0xFF;
 		buffer[0] = (value >>  0) & 0xFF;
 	}
-	
+
 	writef(buffer, 1, sizeof(buffer));
 }
 
@@ -177,7 +177,7 @@ void emit_lc_segment(char *name, uint32_t vm_ad, uint32_t vm_sz,
 {
 	char namebuf[16];
 	int flags, maxprot;
-	
+
 	if (prot == VM_PROT_NONE) {
 		/* special values for __PAGEZERO */
 		maxprot = VM_PROT_NONE;
@@ -247,7 +247,7 @@ int main(int argc, char *argv[])
 	/* General housecleaning and setup. */
 	output = stdout;
 	program = argv[0];
-	
+
 	/* Read in and process any flags. */
 	while ((argc > 1) && (argv[1][0] == '-')) {
 		switch (argv[1][1]) {
diff --git a/plat/osx/include/ack/config.h b/plat/osx/include/ack/config.h
index af4a90ed2..9f58a3941 100644
--- a/plat/osx/include/ack/config.h
+++ b/plat/osx/include/ack/config.h
@@ -8,7 +8,7 @@
 
 /* We're providing a time() system call rather than wanting a wrapper around
  * gettimeofday() in the libc. */
- 
+
 /* #define ACKCONF_TIME_IS_A_SYSCALL */
 
 #endif
diff --git a/plat/osx386/boot.s b/plat/osx386/boot.s
index 0db4bc715..f3ad75fd2 100644
--- a/plat/osx386/boot.s
+++ b/plat/osx386/boot.s
@@ -26,28 +26,28 @@ begtext:
 	! sp+8            argc
 	! sp+4            argv
 	! sp              env
-	
+
 	mov eax, (esp)    ! eax = argc
 	lea ebx, 4(esp)   ! ebx = argv
 	lea ecx, (esp)(eax*4)
 	add ecx, 12       ! environ
-	
+
 	push ecx         ! environ
 	push ebx         ! argc
 	push eax         ! argv
 	push eax         ! dummy, representing the return argument
 	xor ebp, ebp
-	
+
 	jmp __m_a_i_n
-	
+
 	! This provides an emergency exit routine used by EM.
-	
+
 .define EXIT
 .extern EXIT
 EXIT:
 	push 1
 	jmp __exit
-	
+
 .sect rom
 begrom:
 
@@ -66,4 +66,4 @@ begbss:
 
 .define .trppc, .ignmask
 .comm .trppc, 4              ! ptr to user trap handler
-.comm .ignmask, 4            ! user trap ignore mask 
+.comm .ignmask, 4            ! user trap ignore mask
diff --git a/plat/osxppc/boot.s b/plat/osxppc/boot.s
index a1ee67166..f99e70e2d 100644
--- a/plat/osxppc/boot.s
+++ b/plat/osxppc/boot.s
@@ -1,4 +1,4 @@
-! boot.s for osx386
+! boot.s for osxppc
 
 ! Declare segments (the order is important).
 
@@ -30,13 +30,13 @@ begtext:
 	lwz r3, 0(sp)            ! r3 = argc
 	addi r4, sp, 4           ! r4 = argv
 	rlwinm r5, r3, 32-2, 2, 31 ! shift left 2 bits
-	add r5, r5, r4 
+	add r5, r5, r4
 	addi r5, r5, 8           ! r5 = env
-	
+
 	stwu r5, -4(sp)
 	stwu r4, -4(sp)
 	stwu r3, -4(sp)
-	
+
 	b __m_a_i_n
 
 .sect rom
@@ -57,4 +57,4 @@ begbss:
 
 .define .trppc, .ignmask
 .comm .trppc, 4              ! ptr to user trap handler
-.comm .ignmask, 4            ! user trap ignore mask 
+.comm .ignmask, 4            ! user trap ignore mask