Merge branch 'master' of /home/stefan/git/u-boot/u-boot

7 files changed, 75 insertions, 75 deletions

diff --git a/lib_i386/Makefile b/lib_i386/Makefile
index 4cc29f4..4fbcd08 100644
--- a/lib_i386/Makefile
+++ b/lib_i386/Makefile
@@ -39,7 +39,7 @@ COBJS-y	+= video_bios.o
 COBJS-y	+= video.o
 COBJS-y	+= zimage.o
 
-SRCS 	:= $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+SRCS	:= $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 
 $(LIB):	$(obj).depend $(OBJS)
diff --git a/lib_i386/bios.S b/lib_i386/bios.S
index 4606419..d6ca3e3 100644
--- a/lib_i386/bios.S
+++ b/lib_i386/bios.S
@@ -248,7 +248,7 @@ Lhandeled:
 
 /*
  ************************************************************
- * BIOS 	interrupt 10h -- VGA services
+ * BIOS	interrupt 10h -- VGA services
  ************************************************************
  */
 bios_10h:
@@ -293,7 +293,7 @@ gs	movw	%ax, OFFS_AX(%bp)
 
 /*
  ************************************************************
- * BIOS 	interrupt 12h -- Get Memory Size
+ * BIOS	interrupt 12h -- Get Memory Size
  ************************************************************
  */
 bios_12h:
@@ -352,7 +352,7 @@ gs	movw	OFFS_AX(%bp), %ax
 	movw	$0xffff, %ax
 	ret
 
-Lfunc_c0h: 					/* Return System Configuration Parameters (PS2 only) */
+Lfunc_c0h:					/* Return System Configuration Parameters (PS2 only) */
 gs	movw	OFFS_FLAGS(%bp), %ax
 	orw	$1, %ax				/* return carry -- function not supported */
 gs	movw	%ax, OFFS_FLAGS(%bp)
@@ -377,7 +377,7 @@ cs	movw	ram_in_64kb_chunks, %ax
 	shlw	$6, %ax				/* multiply by 64 */
 	subw	$0x400, %ax			/* 1st meg does not count */
 
-gs	movw	%ax, OFFS_AX(%bp)   		/* return memory size between 1M and 16M in 1kb chunks in AX and CX */
+gs	movw	%ax, OFFS_AX(%bp)		/* return memory size between 1M and 16M in 1kb chunks in AX and CX */
 gs	movw	%ax, OFFS_CX(%bp)
 gs	movw	$0, OFFS_BX(%bp)		/* set BX and DX to 0*/
 gs	movw	$0, OFFS_DX(%bp)
@@ -455,8 +455,8 @@ Lfunc_b1h:
 
 .globl ram_in_64kb_chunks
 ram_in_64kb_chunks:
-	.word 	0
+	.word	0
 
 .globl bios_equipment
 bios_equipment:
-	.word 	0
+	.word	0
diff --git a/lib_i386/bios.h b/lib_i386/bios.h
index 59143dd..4901f89 100644
--- a/lib_i386/bios.h
+++ b/lib_i386/bios.h
@@ -57,7 +57,7 @@
 #define OFFS_FLAGS   44    /* 16bit */
 
 #define SEGMENT      0x40
-#define STACK	     0x800  			/* stack at 0x40:0x800 -> 0x800 */
+#define STACK	     0x800			/* stack at 0x40:0x800 -> 0x800 */
 
 /* save general registers */
 /* save some segments     */
diff --git a/lib_i386/bios_pci.S b/lib_i386/bios_pci.S
index b57b726..67fd00b 100644
--- a/lib_i386/bios_pci.S
+++ b/lib_i386/bios_pci.S
@@ -84,14 +84,14 @@ gs	movb	%al, OFFS_AL(%bp)	/* We support cfg type 1 */
 gs	movw	%ax, OFFS_BX(%bp)
 cs	movb	pci_last_bus, %al       /* last bus number */
 gs	movb	%al, OFFS_CL(%bp)
-	jmp 	clear_carry
+	jmp	clear_carry
 
 /*****************************************************************************/
 
 /* device 0-31, function 0-7 */
 pci_bios_find_device:
 #ifdef PCI_BIOS_DEBUG
-cs	incl 	num_pci_bios_find_device
+cs	incl	num_pci_bios_find_device
 #endif
 gs	movw	OFFS_CX(%bp), %di
 	shll	$16, %edi
@@ -214,12 +214,12 @@ pci_bios_read_cfg_byte:
 cs	incl	num_pci_bios_read_cfg_byte
 #endif
 	call	pci_bios_select_register
-gs	movw 	OFFS_DI(%bp), %dx
+gs	movw	OFFS_DI(%bp), %dx
 	andw	$3, %dx
 	addw	$0xcfc, %dx
 	inb	%dx, %al
 gs	movb	%al, OFFS_CL(%bp)
-	jmp 	clear_carry
+	jmp	clear_carry
 
 /*****************************************************************************/
 
@@ -228,12 +228,12 @@ pci_bios_read_cfg_word:
 cs	incl	num_pci_bios_read_cfg_word
 #endif
 	call	pci_bios_select_register
-gs	movw 	OFFS_DI(%bp), %dx
+gs	movw	OFFS_DI(%bp), %dx
 	andw	$2, %dx
 	addw	$0xcfc, %dx
 	inw	%dx, %ax
 gs	movw	%ax, OFFS_CX(%bp)
-	jmp 	clear_carry
+	jmp	clear_carry
 
 
 /*****************************************************************************/
@@ -246,7 +246,7 @@ cs	incl	num_pci_bios_read_cfg_dword
 	movw	$0xcfc, %dx
 	inl	%dx, %eax
 gs	movl	%eax, OFFS_ECX(%bp)
-	jmp 	clear_carry
+	jmp	clear_carry
 
 /*****************************************************************************/
 
@@ -255,12 +255,12 @@ pci_bios_write_cfg_byte:
 cs	incl	num_pci_bios_write_cfg_byte
 #endif
 	call	pci_bios_select_register
-gs	movw 	OFFS_DI(%bp), %dx
+gs	movw	OFFS_DI(%bp), %dx
 gs	movb	OFFS_CL(%bp), %al
 	andw	$3, %dx
 	addw	$0xcfc, %dx
 	outb	%al, %dx
-	jmp 	clear_carry
+	jmp	clear_carry
 
 /*****************************************************************************/
 
@@ -269,12 +269,12 @@ pci_bios_write_cfg_word:
 cs	incl	num_pci_bios_write_cfg_word
 #endif
 	call	pci_bios_select_register
-gs	movw 	OFFS_DI(%bp), %dx
+gs	movw	OFFS_DI(%bp), %dx
 gs	movw	OFFS_CX(%bp), %ax
 	andw	$2, %dx
 	addw	$0xcfc, %dx
 	outw	%ax, %dx
-	jmp 	clear_carry
+	jmp	clear_carry
 
 /*****************************************************************************/
 
@@ -286,7 +286,7 @@ cs	incl	num_pci_bios_write_cfg_dword
 gs	movl	OFFS_ECX(%bp), %eax
 	movw	$0xcfc, %dx
 	outl	%eax, %dx
-	jmp 	clear_carry
+	jmp	clear_carry
 
 /*****************************************************************************/
 
@@ -318,8 +318,8 @@ cs	incl	num_pci_bios_unknown_function
 /*****************************************************************************/
 
 pci_bios_select_register:
-gs	movw 	OFFS_BX(%bp), %bx
-gs	movw 	OFFS_DI(%bp), %ax
+gs	movw	OFFS_BX(%bp), %bx
+gs	movw	OFFS_DI(%bp), %ax
 /* destroys eax, dx */
 __pci_bios_select_register:               /* BX holds device id, AX holds register index */
 	pushl	%ebx
@@ -354,20 +354,20 @@ gs	movw	%ax, OFFS_FLAGS(%bp)
 
 .globl pci_last_bus
 pci_last_bus:
-	.byte 	0
+	.byte	0
 
 #ifdef PCI_BIOS_DEBUG
 .globl num_pci_bios_present
 num_pci_bios_present:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_find_device
 num_pci_bios_find_device:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_find_class
 num_pci_bios_find_class:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_generate_special_cycle
 num_pci_bios_generate_special_cycle:
@@ -375,37 +375,37 @@ num_pci_bios_generate_special_cycle:
 
 .globl num_pci_bios_read_cfg_byte
 num_pci_bios_read_cfg_byte:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_read_cfg_word
 num_pci_bios_read_cfg_word:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_read_cfg_dword
 num_pci_bios_read_cfg_dword:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_write_cfg_byte
 num_pci_bios_write_cfg_byte:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_write_cfg_word
 num_pci_bios_write_cfg_word:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_write_cfg_dword
 num_pci_bios_write_cfg_dword:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_get_irq_routing
 num_pci_bios_get_irq_routing:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_set_irq
 num_pci_bios_set_irq:
-	.long 	0
+	.long	0
 
 .globl num_pci_bios_unknown_function
 num_pci_bios_unknown_function:
-	.long 	0
+	.long	0
 #endif
diff --git a/lib_i386/pci.c b/lib_i386/pci.c
index a7f16aa..4331b04 100644
--- a/lib_i386/pci.c
+++ b/lib_i386/pci.c
@@ -52,7 +52,7 @@ int pci_shadow_rom(pci_dev_t dev, unsigned char *dest)
 	pci_read_config_word(dev, PCI_DEVICE_ID, &device);
 	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_code);
 
- 	class_code &= 0xffffff00;
+	class_code &= 0xffffff00;
 	class_code >>= 8;
 
 #if 0
@@ -103,7 +103,7 @@ int pci_shadow_rom(pci_dev_t dev, unsigned char *dest)
 				printf("%s\n",
 				       (readw(pci_data+0x15) &0x80)?
 				       "Last image":"More images follow");
-				switch 	(readb(pci_data+0x14)) {
+				switch	(readb(pci_data+0x14)) {
 				case 0:
 					printf("X86 code\n");
 					break;
diff --git a/lib_i386/pci_type1.c b/lib_i386/pci_type1.c
index 5dfa8ab..8da8c1c 100644
--- a/lib_i386/pci_type1.c
+++ b/lib_i386/pci_type1.c
@@ -20,14 +20,14 @@
 #define cfg_read(val, addr, op)	*val = op((int)(addr))
 #define cfg_write(val, addr, op)	op((val), (int)(addr))
 
-#define TYPE1_PCI_OP(rw, size, type, op, mask)			 \
-static int								 \
-type1_##rw##_config_##size(struct pci_controller *hose, 		 \
-			      pci_dev_t dev, int offset, type val)	 \
-{									 \
-	outl(dev | (offset & 0xfc) | 0x80000000, (int)hose->cfg_addr); 	 \
-	cfg_##rw(val, hose->cfg_data + (offset & mask), op);	 \
-	return 0;    					 		 \
+#define TYPE1_PCI_OP(rw, size, type, op, mask)				\
+static int								\
+type1_##rw##_config_##size(struct pci_controller *hose,			\
+			      pci_dev_t dev, int offset, type val)	\
+{									\
+	outl(dev | (offset & 0xfc) | 0x80000000, (int)hose->cfg_addr);	\
+	cfg_##rw(val, hose->cfg_data + (offset & mask), op);		\
+	return 0;							\
 }
 
 
diff --git a/lib_i386/realmode_switch.S b/lib_i386/realmode_switch.S
index 0433cd4..d6c74ec 100644
--- a/lib_i386/realmode_switch.S
+++ b/lib_i386/realmode_switch.S
@@ -26,7 +26,7 @@
 
 /*
  * Stack frame at 0xe00
- *      e00 ebx;
+ *	e00 ebx;
  *	e04 ecx;
  *	e08 edx;
  *	e0c esi;
@@ -56,13 +56,13 @@ realmode_enter:
 o32	pusha
 o32	pushf
 	cli
-	sidt   	saved_idt
-	sgdt    saved_gdt
-	movl    %esp, %eax
-	movl    %eax, saved_protected_mode_esp
+	sidt	saved_idt
+	sgdt	saved_gdt
+	movl	%esp, %eax
+	movl	%eax, saved_protected_mode_esp
 
 	movl	$0x10, %eax
-	movl    %eax, %esp
+	movl	%eax, %esp
 	movw	$0x28, %ax
 	movw	%ax, %ds
 	movw	%ax, %es
@@ -70,10 +70,10 @@ o32	pushf
 	movw	%ax, %gs
 
 	lidt	realmode_idt_ptr
-	movl	%cr0, %eax                	/* Go back into real mode by */
-	andl	$0x7ffffffe, %eax         	/* clearing PE to 0 */
+	movl	%cr0, %eax			/* Go back into real mode by */
+	andl	$0x7ffffffe, %eax		/* clearing PE to 0 */
 	movl	%eax, %cr0
-	ljmp	$0x0,$do_realmode             	/* switch to real mode */
+	ljmp	$0x0,$do_realmode		/* switch to real mode */
 
 do_realmode:					/* realmode code from here */
 	movw	%cs,%ax
@@ -115,20 +115,20 @@ o32	popf
 	popw	%ss
 	movl	%eax, %esp
 cs	movl	temp_eax, %eax
-	wbinvd                                  /* self-modifying code,
+	wbinvd					/* self-modifying code,
 						 * better flush the cache */
 
 	.byte	0x9a				/* lcall */
 temp_ip:
-	.word	0	     			/* new ip */
+	.word	0				/* new ip */
 temp_cs:
-	.word   0				/* new cs */
+	.word	0				/* new cs */
 realmode_ret:
 						/* save eax, esp and ss */
 cs	movl	%eax, saved_eax
 	movl	%esp, %eax
 cs	movl	%eax, saved_esp
-	movw    %ss, %ax
+	movw	%ss, %ax
 cs	movw	%ax, saved_ss
 
 	/* restore the stack, note that we set sp to 0x244;
@@ -170,26 +170,26 @@ cs	movw	temp_ip, %ax
 	pushl	%ebx
 
 o32 cs	lidt	saved_idt
-o32 cs	lgdt    saved_gdt			/* Set GDTR */
+o32 cs	lgdt	saved_gdt			/* Set GDTR */
 
-	movl    %cr0, %eax              	/* Go back into protected mode */
-	orl     $1,%eax                 	/* reset PE to 1 */
-	movl    %eax, %cr0
-	jmp     next_line               	/* flush prefetch queue */
+	movl	%cr0, %eax			/* Go back into protected mode */
+	orl	$1,%eax	/* reset PE to 1 */
+	movl	%eax, %cr0
+	jmp	next_line			/* flush prefetch queue */
 next_line:
 	movw	$return_ptr, %ax
-	movw    %ax,%bp
+	movw	%ax,%bp
 o32 cs	ljmp	*(%bp)
 
 .code32
 protected_mode:
-	movl    $0x18,%eax         		/* reload GDT[3] */
-	movw    %ax,%fs                 	/* reset FS */
-	movw	%ax,%ds                		/* reset DS */
-	movw    %ax,%gs                 	/* reset GS */
-	movw    %ax,%es                 	/* reset ES */
-	movw    %ax,%ss                 	/* reset SS */
-	movl    saved_protected_mode_esp, %eax
+	movl	$0x18,%eax			/* reload GDT[3] */
+	movw	%ax,%fs				/* reset FS */
+	movw	%ax,%ds				/* reset DS */
+	movw	%ax,%gs				/* reset GS */
+	movw	%ax,%es				/* reset ES */
+	movw	%ax,%ss				/* reset SS */
+	movl	saved_protected_mode_esp, %eax
 	movl	%eax, %esp
 	popf
 	popa
@@ -199,7 +199,7 @@ temp_eax:
 	.long	0
 
 saved_ss:
-	.word   0
+	.word	0
 saved_esp:
 	.long	0
 saved_eax:
@@ -210,12 +210,12 @@ realmode_idt_ptr:
 	.word	0x0, 0x0
 
 saved_gdt:
-	.word 	0, 0, 0, 0
+	.word	0, 0, 0, 0
 saved_idt:
-	.word 	0, 0, 0, 0
+	.word	0, 0, 0, 0
 
 saved_protected_mode_esp:
-	.long 	0
+	.long	0
 
 return_ptr:
 	.long	protected_mode