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/cmi/Makefile   | 2 +-
 board/cmi/flash.c    | 6 +++---
 board/cmi/u-boot.lds | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'board/cmi')

diff --git a/board/cmi/Makefile b/board/cmi/Makefile
index 0a92da874..2324d8772 100644
--- a/board/cmi/Makefile
+++ b/board/cmi/Makefile
@@ -29,7 +29,7 @@ OBJS	:= flash.o cmi.o
 SOBJS	:=
 
 $(LIB):	$(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)
diff --git a/board/cmi/flash.c b/board/cmi/flash.c
index 9c802b913..f7c25f428 100644
--- a/board/cmi/flash.c
+++ b/board/cmi/flash.c
@@ -458,7 +458,7 @@ static int write_short (flash_info_t *info, ulong dest, ushort data)
 	if (!(info->flash_id & FLASH_VENDMASK)) {
 		return 4;
 	}
-        *addr = FLASH_CMD_ERASE_CONFIRM;
+	*addr = FLASH_CMD_ERASE_CONFIRM;
 	*addr = FLASH_CMD_WRITE;
 
 	*((vu_short *)dest) = data;
@@ -474,7 +474,7 @@ static int write_short (flash_info_t *info, ulong dest, ushort data)
 	/* wait for error or finish */
 	while(!(addr[0] & FLASH_STATUS_DONE)){
 		if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-		  	addr[0] = FLASH_CMD_RESET;
+			addr[0] = FLASH_CMD_RESET;
 			return (1);
 		}
 	}
@@ -505,7 +505,7 @@ int flash_real_protect(flash_info_t *info, long sector, int prot)
 	start = get_timer (0);
 	while(!(addr[0] & FLASH_STATUS_DONE)){
 		if (get_timer(start) > CFG_FLASH_ERASE_TOUT) {
-		  	printf("Flash protect timeout at address %lx\n",  info->start[sector]);
+			printf("Flash protect timeout at address %lx\n",  info->start[sector]);
 			addr[0] = FLASH_CMD_RESET;
 			return (1);
 		}
diff --git a/board/cmi/u-boot.lds b/board/cmi/u-boot.lds
index 04cc87a81..318880108 100644
--- a/board/cmi/u-boot.lds
+++ b/board/cmi/u-boot.lds
@@ -101,6 +101,11 @@ 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 = .;
@@ -123,10 +128,10 @@ SECTIONS
 
   _end = . ;
   PROVIDE (end = .);
-    . = env_start;
+/*   . = env_start;
 	.ppcenv	:
 	{
 		common/environment.o (.ppcenv)
 	}
-
+*/
 }
-- 
cgit v1.2.3