* Code cleanup:LABEL_2003_06_27_2340

  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)

4 files changed, 31 insertions, 28 deletions

diff --git a/board/incaip/Makefile b/board/incaip/Makefile
index ad59bf0af65..d1cdc6b9244 100644
--- a/board/incaip/Makefile
+++ b/board/incaip/Makefile
@@ -29,7 +29,7 @@ OBJS	= $(BOARD).o flash.o
 SOBJS	= memsetup.o
 
 $(LIB):	.depend $(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 #########################################################################
 
diff --git a/board/incaip/flash.c b/board/incaip/flash.c
index e7fd54063b4..686f2e96fd0 100644
--- a/board/incaip/flash.c
+++ b/board/incaip/flash.c
@@ -85,14 +85,14 @@ unsigned long flash_init (void)
 		memset(&flash_info[i], 0, sizeof(flash_info_t));
 #endif
 
-		flash_info[i].size = 
+		flash_info[i].size =
 			flash_get_size((FPW *)flashbase, &flash_info[i]);
 
 		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
 			printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx\n",
 			i, flash_info[i].size);
 		}
-		
+
 		size += flash_info[i].size;
 	}
 
@@ -172,13 +172,13 @@ static flash_info_t *flash_get_info(ulong base)
 {
 	int i;
 	flash_info_t * info;
-	
+
 	for (i = 0; i < CFG_MAX_FLASH_BANKS; i ++) {
 		info = & flash_info[i];
 		if (info->start[0] <= base && base < info->start[0] + info->size)
 			break;
 	}
-	
+
 	return i == CFG_MAX_FLASH_BANKS ? 0 : info;
 }
 
@@ -225,32 +225,32 @@ void flash_print_info (flash_info_t *info)
 	case FLASH_AM640U:
 		fmt = "29LV641D (64 Mbit, uniform sectors)\n";
 		break;
-        case FLASH_28F800C3B:
-        case FLASH_28F800C3T:
+	case FLASH_28F800C3B:
+	case FLASH_28F800C3T:
 		fmt = "28F800C3%s (8 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL800B:
 	case FLASH_INTEL800T:
 		fmt = "28F800B3%s (8 Mbit, %s)\n";
 		break;
-        case FLASH_28F160C3B:
-        case FLASH_28F160C3T:
+	case FLASH_28F160C3B:
+	case FLASH_28F160C3T:
 		fmt = "28F160C3%s (16 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL160B:
 	case FLASH_INTEL160T:
 		fmt = "28F160B3%s (16 Mbit, %s)\n";
 		break;
-        case FLASH_28F320C3B:
-        case FLASH_28F320C3T:
+	case FLASH_28F320C3B:
+	case FLASH_28F320C3T:
 		fmt = "28F320C3%s (32 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL320B:
 	case FLASH_INTEL320T:
 		fmt = "28F320B3%s (32 Mbit, %s)\n";
 		break;
-        case FLASH_28F640C3B:
-        case FLASH_28F640C3T:
+	case FLASH_28F640C3B:
+	case FLASH_28F640C3T:
 		fmt = "28F640C3%s (64 Mbit, %s)\n";
 		break;
 	case FLASH_INTEL640B:
@@ -534,15 +534,15 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 	 left > 0 && res == 0;
 	 addr += sizeof(data), left -= sizeof(data) - bytes) {
 
-        bytes = addr & (sizeof(data) - 1);
-        addr &= ~(sizeof(data) - 1);
+	bytes = addr & (sizeof(data) - 1);
+	addr &= ~(sizeof(data) - 1);
 
 	/* combine source and destination data so can program
 	 * an entire word of 16 or 32 bits
 	 */
-        for (i = 0; i < sizeof(data); i++) {
-            data <<= 8;
-            if (i < bytes || i - bytes >= left )
+	for (i = 0; i < sizeof(data); i++) {
+	    data <<= 8;
+	    if (i < bytes || i - bytes >= left )
 		data += *((uchar *)addr + i);
 	    else
 		data += *src++;
diff --git a/board/incaip/memsetup.S b/board/incaip/memsetup.S
index f1afb5c18c4..245ab72f906 100644
--- a/board/incaip/memsetup.S
+++ b/board/incaip/memsetup.S
@@ -133,7 +133,7 @@ b1:
 	sw	t1, MC_MRSCODE(t0)
 
 	/* Set word width to 16 bit */
-	li	t1, 0x2  
+	li	t1, 0x2
 	sw	t1, MC_CFGDW(t0)
 
 	/* Set CS0 to SDRAM parameters */
@@ -154,4 +154,3 @@ b1:
 
 	j	ra
 	nop
-
diff --git a/board/incaip/u-boot.lds b/board/incaip/u-boot.lds
index 3c9ca890617..a2d19a84c9e 100644
--- a/board/incaip/u-boot.lds
+++ b/board/incaip/u-boot.lds
@@ -29,19 +29,19 @@ OUTPUT_ARCH(mips)
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text       :
 	{
 	  *(.text)
 	}
 
-        . = ALIGN(4);
-        .rodata  : { *(.rodata) }
+	. = ALIGN(4);
+	.rodata  : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data  : { *(.data) }
+	. = ALIGN(4);
+	.data  : { *(.data) }
 
 	. = ALIGN(4);
 	.sdata  : { *(.sdata) }
@@ -54,11 +54,15 @@ SECTIONS
 
 	.sdata  : { *(.sdata) }
 
+	__u_boot_cmd_start = .;
+	.u_boot_cmd : { *(.u_boot_cmd) }
+	__u_boot_cmd_end = .;
+
 	uboot_end_data = .;
 	num_got_entries = (__got_end - __got_start) >> 2;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.sbss  : { *(.sbss) }
-        .bss  : { *(.bss) }
+	.bss  : { *(.bss) }
 	uboot_end = .;
 }