* 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)
diff --git a/board/cmi/Makefile b/board/cmi/Makefile
index 0a92da8..2324d87 100644
--- a/board/cmi/Makefile
+++ b/board/cmi/Makefile
@@ -29,7 +29,7 @@
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 9c802b9..f7c25f4 100644
--- a/board/cmi/flash.c
+++ b/board/cmi/flash.c
@@ -458,7 +458,7 @@
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 @@
/* 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 @@
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 04cc87a..3188801 100644
--- a/board/cmi/u-boot.lds
+++ b/board/cmi/u-boot.lds
@@ -101,6 +101,11 @@
_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 @@
_end = . ;
PROVIDE (end = .);
- . = env_start;
+/* . = env_start;
.ppcenv :
{
common/environment.o (.ppcenv)
}
-
+*/
}