From 8bde7f776c77b343aca29b8c7b58464d915ac245 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Fri, 27 Jun 2003 21:31:46 +0000
Subject: * Code cleanup:   - 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)
---
 board/atc/Makefile   |  2 +-
 board/atc/atc.c      | 18 +++++++++---------
 board/atc/flash.c    | 24 ++++++++++++------------
 board/atc/u-boot.lds |  5 ++++-
 4 files changed, 26 insertions(+), 23 deletions(-)

(limited to 'board/atc')

diff --git a/board/atc/Makefile b/board/atc/Makefile
index 35b84288da..7a2014d466 100644
--- a/board/atc/Makefile
+++ b/board/atc/Makefile
@@ -28,7 +28,7 @@ LIB	= lib$(BOARD).a
 OBJS	= $(BOARD).o flash.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 
diff --git a/board/atc/atc.c b/board/atc/atc.c
index ea7416a2bd..42abcda82c 100644
--- a/board/atc/atc.c
+++ b/board/atc/atc.c
@@ -207,14 +207,14 @@ const iop_conf_t iop_conf_tab[4][32] = {
  * UPMB initialization table
  */
 #define	_NOT_USED_	0xFFFFFFFF
-  
+
 static const uint rtc_table[] =
 {
 	/*
 	 * Single Read. (Offset 0 in UPMA RAM)
 	 */
-	0xfffec00, 0xfffac00, 0xfff2d00, 0xfef2800, 
-	0xfaf2080, 0xfaf2080, 0xfff2400, 0x1fff6c05, /* last */	    
+	0xfffec00, 0xfffac00, 0xfff2d00, 0xfef2800,
+	0xfaf2080, 0xfaf2080, 0xfff2400, 0x1fff6c05, /* last */
 	/*
 	 * Burst Read. (Offset 8 in UPMA RAM)
 	 */
@@ -225,7 +225,7 @@ static const uint rtc_table[] =
 	/*
 	 * Single Write. (Offset 18 in UPMA RAM)
 	 */
-	0xfffec00, 0xfffac00, 0xfff2d00, 0xfef2800, 
+	0xfffec00, 0xfffac00, 0xfff2d00, 0xfef2800,
 	0xfaf2080, 0xfaf2080, 0xfaf2400, 0x1fbf6c05, /* last */
 	/*
 	 * Burst Write. (Offset 20 in UPMA RAM)
@@ -244,8 +244,8 @@ static const uint rtc_table[] =
 	 * Exception. (Offset 3c in UPMA RAM)
 	 */
 	_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
-};												
-																	
+};
+
 /* ------------------------------------------------------------------------- */
 
 /* Check Board Identity:
@@ -366,13 +366,13 @@ int misc_init_r(void)
 {
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
 	volatile memctl8260_t *memctl = &immap->im_memctl;
-	
+
 	upmconfig(UPMA, (uint *)rtc_table, sizeof(rtc_table) / sizeof(uint));
-	memctl->memc_mamr = MxMR_RLFx_6X | MxMR_WLFx_6X | MxMR_OP_NORM;	
+	memctl->memc_mamr = MxMR_RLFx_6X | MxMR_WLFx_6X | MxMR_OP_NORM;
 
 	return (0);
 }
-			
+
 long int initdram (int board_type)
 {
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
diff --git a/board/atc/flash.c b/board/atc/flash.c
index 6d7b38bde8..26b7c80d35 100644
--- a/board/atc/flash.c
+++ b/board/atc/flash.c
@@ -76,14 +76,14 @@ unsigned long flash_init (void)
 
 		memset(&flash_info[i], 0, sizeof(flash_info_t));
 
-		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;
 	}
 
@@ -163,13 +163,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;
 }
 
@@ -216,32 +216,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:
diff --git a/board/atc/u-boot.lds b/board/atc/u-boot.lds
index 9d56f13a02..7ac29a0fb2 100644
--- a/board/atc/u-boot.lds
+++ b/board/atc/u-boot.lds
@@ -94,6 +94,10 @@ SECTIONS
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -116,4 +120,3 @@ SECTIONS
   _end = . ;
   PROVIDE (end = .);
 }
-
-- 
cgit v1.2.3