Merge commit 'wd/master'

4 files changed, 52 insertions, 52 deletions

diff --git a/cpu/i386/sc520.c b/cpu/i386/sc520.c
index d0a7341..640b255 100644
--- a/cpu/i386/sc520.c
+++ b/cpu/i386/sc520.c
@@ -406,7 +406,7 @@ void reset_timer(void)
 ulong get_timer(ulong base)
 {
 	/* fixme: 30 or 33 */
-	return 	read_mmcr_word(SC520_GPTMR0CNT) / 33;
+	return	read_mmcr_word(SC520_GPTMR0CNT) / 33;
 }
 
 void set_timer(ulong t)
diff --git a/cpu/i386/sc520_asm.S b/cpu/i386/sc520_asm.S
index 8fc713d..34322ea 100644
--- a/cpu/i386/sc520_asm.S
+++ b/cpu/i386/sc520_asm.S
@@ -512,7 +512,7 @@ dram_done:
 	shrl	$2, %eax
 	movl	%eax, %ebx
 
-bank2: 	movl	(%edi), %eax
+bank2:	movl	(%edi), %eax
 	movl	%eax, %ecx
 	andl	$0x00800000, %ecx
 	jz	bank1
@@ -520,7 +520,7 @@ bank2: 	movl	(%edi), %eax
 	shll	$6, %eax
 	movl	%eax, %ebx
 
-bank1: 	movl	(%edi), %eax
+bank1:	movl	(%edi), %eax
 	movl	%eax, %ecx
 	andl	$0x00008000, %ecx
 	jz	bank0
@@ -528,7 +528,7 @@ bank1: 	movl	(%edi), %eax
 	shll	$14, %eax
 	movl	%eax, %ebx
 
-bank0: 	movl	(%edi), %eax
+bank0:	movl	(%edi), %eax
 	movl	%eax, %ecx
 	andl	$0x00000080, %ecx
 	jz	done
@@ -563,7 +563,7 @@ set_ecc:
 	xorl	%eax, %eax
 	shrl	$2, %ecx
 	cld
-	rep 	stosl
+	rep	stosl
 			/* enable read, write buffers */
 	movb    $0x11, %al
 	movl    $DBCTL, %edi
diff --git a/cpu/i386/start.S b/cpu/i386/start.S
index 51a27aa..264ac09 100644
--- a/cpu/i386/start.S
+++ b/cpu/i386/start.S
@@ -34,8 +34,8 @@
 .globl _i386boot_start
 _i386boot_start:
 _start:
-	movl    $0x18,%eax         	/* Load our segement registes, the
-					 * gdt have already been loaded by start16.S */
+	movl    $0x18,%eax	/* Load our segement registes, the
+				 * gdt have already been loaded by start16.S */
 	movw    %ax,%fs
 	movw	%ax,%ds
 	movw    %ax,%gs
@@ -76,7 +76,7 @@ mem_init_ret:
 	movl	$.progress0a, %ebp
 	jmp	show_boot_progress
 .progress0a:
-	jmp 	die
+	jmp	die
 mem_ok:
 
 	/* indicate progress */
@@ -138,7 +138,7 @@ data_fail:
 	movl	$.progress2a, %ebp
 	jmp	show_boot_progress
 .progress2a:
-	jmp 	die
+	jmp	die
 
 data_ok:
 
@@ -162,7 +162,7 @@ bss:
 	movl	$0, (%edi)
 	add	$4, %edi
 	loop	bss
-	jmp 	bss_ok
+	jmp	bss_ok
 
 bss_fail:
 	/* indicate (lack of) progress */
@@ -170,7 +170,7 @@ bss_fail:
 	movl	$.progress3a, %ebp
 	jmp	show_boot_progress
 .progress3a:
-	jmp 	die
+	jmp	die
 
 bss_ok:
 
diff --git a/cpu/i386/start16.S b/cpu/i386/start16.S
index 239f2ff..1ebb6bc 100644
--- a/cpu/i386/start16.S
+++ b/cpu/i386/start16.S
@@ -39,74 +39,74 @@ start16:
 board_init16_ret:
 
 	/* Turn of cache (this might require a 486-class CPU) */
-	movl    %cr0, %eax
-	orl     $0x60000000,%eax
-	movl    %eax, %cr0
+	movl	%cr0, %eax
+	orl	$0x60000000,%eax
+	movl	%eax, %cr0
 	wbinvd
 
 	/* load the descriptor tables */
 o32 cs	lidt	idt_ptr
-o32 cs	lgdt    gdt_ptr
+o32 cs	lgdt	gdt_ptr
 
 
 	/* Now, we enter protected mode */
-	movl    %cr0, %eax
-	orl     $1,%eax
-	movl    %eax, %cr0
+	movl	%cr0, %eax
+	orl	$1,%eax
+	movl	%eax, %cr0
 
 	/* Flush the prefetch queue */
-	jmp     ff
+	jmp	ff
 ff:
 
 	/* Finally jump to the 32bit initialization code */
 	movw	$code32start, %ax
-	movw    %ax,%bp
+	movw	%ax,%bp
 o32 cs	ljmp	*(%bp)
 
 	/* 48-bit far pointer */
 code32start:
-	.long	_start                          /* offset */
-	.word	0x10                            /* segment */
+	.long	_start		/* offset */
+	.word	0x10		/* segment */
 
 idt_ptr:
-	.word	0				/* limit */
-	.long	0		       		/* base */
+	.word	0		/* limit */
+	.long	0		/* base */
 
 gdt_ptr:
-	.word	0x30			        /* limit (48 bytes = 6 GDT entries) */
-	.long	BOOT_SEG + gdt	        	/* base */
+	.word	0x30		/* limit (48 bytes = 6 GDT entries) */
+	.long	BOOT_SEG + gdt	/* base */
 
 	/* The GDT table ...
 	 *
-	 *       Selector	Type
-	 * 	 0x00		NULL
-	 * 	 0x08		Unused
+	 *	 Selector	Type
+	 *	 0x00		NULL
+	 *	 0x08		Unused
 	 *	 0x10		32bit code
 	 *	 0x18		32bit data/stack
 	 *	 0x20		16bit code
-	 *	 0x28	 	16bit data/stack
+	 *	 0x28		16bit data/stack
 	 */
 
 gdt:
-	.word	0, 0, 0, 0			/* NULL  */
-	.word	0, 0, 0, 0			/* unused */
-
-	.word	0xFFFF				/* 4Gb - (0x100000*0x1000 = 4Gb) */
-	.word	0				/* base address = 0 */
-	.word	0x9B00				/* code read/exec */
-	.word	0x00CF				/* granularity = 4096, 386 (+5th nibble of limit) */
-
-	.word	0xFFFF				/* 4Gb - (0x100000*0x1000 = 4Gb) */
-	.word	0x0				/* base address = 0 */
-	.word	0x9300				/* data read/write */
-	.word	0x00CF				/* granularity = 4096, 386 (+5th nibble of limit) */
-
-	.word	0xFFFF				/* 64kb */
-	.word	0				/* base address = 0 */
-	.word	0x9b00				/* data read/write */
-	.word	0x0010				/* granularity = 1  (+5th nibble of limit) */
-
-	.word	0xFFFF				/* 64kb */
-	.word	0				/* base address = 0 */
-	.word	0x9300				/* data read/write */
-	.word	0x0010				/* granularity = 1 (+5th nibble of limit) */
+	.word	0, 0, 0, 0	/* NULL  */
+	.word	0, 0, 0, 0	/* unused */
+
+	.word	0xFFFF		/* 4Gb - (0x100000*0x1000 = 4Gb) */
+	.word	0		/* base address = 0 */
+	.word	0x9B00		/* code read/exec */
+	.word	0x00CF		/* granularity = 4096, 386 (+5th nibble of limit) */
+
+	.word	0xFFFF		/* 4Gb - (0x100000*0x1000 = 4Gb) */
+	.word	0x0		/* base address = 0 */
+	.word	0x9300		/* data read/write */
+	.word	0x00CF		/* granularity = 4096, 386 (+5th nibble of limit) */
+
+	.word	0xFFFF		/* 64kb */
+	.word	0		/* base address = 0 */
+	.word	0x9b00		/* data read/write */
+	.word	0x0010		/* granularity = 1  (+5th nibble of limit) */
+
+	.word	0xFFFF		/* 64kb */
+	.word	0		/* base address = 0 */
+	.word	0x9300		/* data read/write */
+	.word	0x0010		/* granularity = 1 (+5th nibble of limit) */