[Openocd-svn] r2721 - trunk/src zy1000/trunk/build zy1000/trunk/build/menu

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-09-17 13:44:14 +0200 (Thu, 17 Sep 2009)
New Revision: 2721

Modified:
   trunk/src/ecosboard.c
   zy1000/trunk/build/makefw.sh
   zy1000/trunk/build/menu/zy1000menu.xml
Log:
prefix zy1000_reboot command to avoid name conflicts

Modified: trunk/src/ecosboard.c
===================================================================
--- trunk/src/ecosboard.c	2009-09-17 11:23:41 UTC (rev 2720)
+++ trunk/src/ecosboard.c	2009-09-17 11:44:14 UTC (rev 2721)
@@ -503,7 +503,7 @@
 
 	Jim_CreateCommand(httpstate.jim_interp, "log", zylinjtag_Jim_Command_log,
 			NULL, NULL);
-	Jim_CreateCommand(httpstate.jim_interp, "reboot",
+	Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot",
 			zylinjtag_Jim_Command_reboot, NULL, NULL);
 	Jim_CreateCommand(httpstate.jim_interp, "threads",
 			zylinjtag_Jim_Command_threads, NULL, NULL);

Modified: zy1000/trunk/build/makefw.sh
===================================================================
--- zy1000/trunk/build/makefw.sh	2009-09-17 11:23:41 UTC (rev 2720)
+++ zy1000/trunk/build/makefw.sh	2009-09-17 11:44:14 UTC (rev 2721)
@@ -1,4 +1,4 @@
-arm-elf-objcopy -R .fastbss -O binary src/openocd src/openocd.bin
+arm-elf-objcopy -O binary src/openocd src/openocd.bin
 cat >deflateopenocd.bin $OPENOCD/deflate.bin
 cp src/openocd.bin openocd.bin
 rm -f openocd.bin.gz

Modified: zy1000/trunk/build/menu/zy1000menu.xml
===================================================================
--- zy1000/trunk/build/menu/zy1000menu.xml	2009-09-17 11:23:41 UTC (rev 2720)
+++ zy1000/trunk/build/menu/zy1000menu.xml	2009-09-17 11:44:14 UTC (rev 2721)
@@ -144,7 +144,7 @@
 			<tcl>
 				if {[string compare $form_action "Reboot ZY1000"]==0} {
 					append buffer "Rebooting ZY1000..."
-					reboot
+					zy1000_reboot
 				}
 			</tcl>
 
@@ -188,7 +188,7 @@
 			if {[string compare $form_action "Select and reload"]==0} {
 				capture "trunc /config/settings/openocd.cfg"
 				capture "append_file /config/settings/openocd.cfg script $form_target"
-				reboot 
+				zy1000_reboot 
 			}
 			
 			set form_target [load_target] 
@@ -410,7 +410,7 @@
 	
 				if {[string compare $form_action "Reload"]==0} {
 					append buffer "Reloading Config Scripts...<p>"
-					reboot
+					zy1000_reboot
 				}
 			</tcl>
 			<form enctype="multipart/form-data" action="reload.tcl" method="post">
@@ -1257,7 +1257,7 @@
 					if {[check_firmware $form_filecontent]} {
 						write_firmware $form_filecontent
 						append buffer "<br><div style='font-size:14px;'>Upgraded Zylin JTAG, rebooting (wait ca. 30 seconds)...</div><br>"
-						reboot
+						zy1000_reboot
 					} else {
 						append buffer "<br>Not a valid Zylin JTAG firmware file.<br>"
 					}
@@ -1271,7 +1271,7 @@
 						}
 					}				
 					rmdir /config/settings
-					reboot
+					zy1000_reboot
 					append buffer "Restoring factory settings (wait ca. 30 seconds)...<br>"
 				} else {
 					append buffer {<div style="font-size:14px;">Upgrade Zylin JTAG firmware + reboot. </div><p>}
@@ -1480,13 +1480,13 @@
 					$fp puts -nonewline "$form_ip,$form_mask,$form_gateway"
 					$fp close
 					append buffer "Set $form_ip,$form_mask,$form_gateway to $form_filename. Reloading settings..."
-					reboot
+					zy1000_reboot
 				} elseif {[string compare $form_action "Use DHCP"]==0} {
 					set fp [aio.open $form_filename w];
 					$fp puts -nonewline ""
 					$fp close
 					append buffer "Using DHCP. Reloading settings..."
-					reboot
+					zy1000_reboot
 				} else {
 				</tcl>
 					<form action="zy1000.tcl" method="post">