Menu
▾
▴
[Can-svn] SF.net SVN: can: [845] trunk
|
From: <ak...@us...> - 2008-02-17 14:54:20
|
Revision: 845
http://can.svn.sourceforge.net/can/?rev=845&view=rev
Author: akhe
Date: 2008-02-17 06:54:15 -0800 (Sun, 17 Feb 2008)
Log Message:
-----------
Cleaning up openocd scripts
Modified Paths:
--------------
trunk/firmware/arm/str/cantest_str73x_gcc/Makefile
trunk/firmware/arm/str/common/openocd/linux/str73x-configs/str73x_jtagkey-flash-program.cfg
trunk/firmware/arm/str/common/openocd/windows/str73x-configs/str73x_jtagkey-flash-erase.cfg
trunk/firmware/arm/str/common/openocd/windows/str73x-configs/str73x_jtagkey-flash-program.cfg
trunk/firmware/arm/str/common/str75x_lib/src/75x_can.c
trunk/firmware/arm/str/dosubst.bat
trunk/setenv_vscp.bat
Modified: trunk/firmware/arm/str/cantest_str73x_gcc/Makefile
===================================================================
--- trunk/firmware/arm/str/cantest_str73x_gcc/Makefile 2008-02-17 12:24:27 UTC (rev 844)
+++ trunk/firmware/arm/str/cantest_str73x_gcc/Makefile 2008-02-17 14:54:15 UTC (rev 845)
@@ -347,19 +347,14 @@
# specify the directory where openocd executable resides (openocd-ftd2xx.exe or openocd-pp.exe)
# Note: you may have to adjust this if a newer version of YAGARTO has been downloaded
-OPENOCD_DIR = 'C:\Program Files\openocd-r247\bin\'
+#OPENOCD_DIR = C:\Program Files\openocd-r247\bin\
# specify OpenOCD executable (pp is for the wiggler, ftd2xx is for the USB debugger)
#OPENOCD = $(OPENOCD_DIR)openocd-pp.exe
-OPENOCD = $(OPENOCD_DIR)openocd-ftd2xx.exe
+OPENOCD = "$(OPENOCD_DIR)openocd-ftd2xx.exe"
# specify OpenOCD configuration file (pick the one for your device)
-#OPENOCD_CFG = C:\openocd-configs\str73x-configs\str73x_signalyzer-flash-program.cfg
-#OPENOCD_CFG = C:\openocd-configs\str73x-configs\str73x_jtagkey-flash-program.cfg
-#OPENOCD_CFG = C:\openocd-configs\str73x-configs\str73x_armusbocd-flash-program.cfg
-#OPENOCD_CFG = C:\openocd-configs\str73x-configs\str73x_pp-flash-program.cfg
-#OPENOCD_CFG = "D:\development\armdev\str73x open source development\Code\Windows\openocd-configs\str73x-configs\str73x_jtagkey-flash-program.cfg"
-OPENOCD_CFG = "c:\str73x_jtagkey-flash-program.cfg"
+OPENOCD_CFG = l:/str73x-configs/str73x_jtagkey-flash-program.cfg
program:
@echo
Modified: trunk/firmware/arm/str/common/openocd/linux/str73x-configs/str73x_jtagkey-flash-program.cfg
===================================================================
--- trunk/firmware/arm/str/common/openocd/linux/str73x-configs/str73x_jtagkey-flash-program.cfg 2008-02-17 12:24:27 UTC (rev 844)
+++ trunk/firmware/arm/str/common/openocd/linux/str73x-configs/str73x_jtagkey-flash-program.cfg 2008-02-17 14:54:15 UTC (rev 845)
@@ -32,4 +32,9 @@
flash bank str7x 0x80000000 0x00040000 0 0 0 STR73x
#Script used for FLASH programming
-target_script 0 reset /home/l3golas/openocd-configs/str73x-configs/str73x_flashprogram.ocd
+#target_script 0 reset C:\openocd-configs\str73x-configs\str73x_flashprogram.ocd
+#target_script 0 reset "D:\development\armdev\str73x open source development\Code\Windows\openocd-configs\str73x-configs\str73x_jtagkey-flash-program.cfg"
+target_script 0 reset "D:\development\armdev\str73x open source development\Code\Windows\openocd-configs\str73x-configs\str73x_flashprogram.ocd"
+
+# For more information about the configuration files, take a look at:
+# http://openfacts.berlios.de/index-en.phtml?title=Open+On-Chip+Debugger
\ No newline at end of file
Modified: trunk/firmware/arm/str/common/openocd/windows/str73x-configs/str73x_jtagkey-flash-erase.cfg
===================================================================
--- trunk/firmware/arm/str/common/openocd/windows/str73x-configs/str73x_jtagkey-flash-erase.cfg 2008-02-17 12:24:27 UTC (rev 844)
+++ trunk/firmware/arm/str/common/openocd/windows/str73x-configs/str73x_jtagkey-flash-erase.cfg 2008-02-17 14:54:15 UTC (rev 845)
@@ -32,4 +32,4 @@
flash bank str7x 0x80000000 0x00040000 0 0 0 STR73x
#Script used for FLASH erasing
-target_script 0 reset C:\openocd-configs\str73x-configs\str73x_flasherase.ocd
+target_script 0 reset l:/str73x-configs/str73x_flasherase.ocd
Modified: trunk/firmware/arm/str/common/openocd/windows/str73x-configs/str73x_jtagkey-flash-program.cfg
===================================================================
--- trunk/firmware/arm/str/common/openocd/windows/str73x-configs/str73x_jtagkey-flash-program.cfg 2008-02-17 12:24:27 UTC (rev 844)
+++ trunk/firmware/arm/str/common/openocd/windows/str73x-configs/str73x_jtagkey-flash-program.cfg 2008-02-17 14:54:15 UTC (rev 845)
@@ -32,6 +32,7 @@
flash bank str7x 0x80000000 0x00040000 0 0 0 STR73x
#Script used for FLASH programming
-#target_script 0 reset C:\openocd-configs\str73x-configs\str73x_flashprogram.ocd
-#target_script 0 reset "D:\development\armdev\str73x open source development\Code\Windows\openocd-configs\str73x-configs\str73x_jtagkey-flash-program.cfg"
-target_script 0 reset "C:\str73x_jtagkey-flash-program.cfg"
\ No newline at end of file
+target_script 0 reset "l:/str73x-configs/str73x_flashprogram.ocd"
+
+# For more information about the configuration files, take a look at:
+# http://openfacts.berlios.de/index-en.phtml?title=Open+On-Chip+Debugger
\ No newline at end of file
Modified: trunk/firmware/arm/str/common/str75x_lib/src/75x_can.c
===================================================================
--- trunk/firmware/arm/str/common/str75x_lib/src/75x_can.c 2008-02-17 12:24:27 UTC (rev 844)
+++ trunk/firmware/arm/str/common/str75x_lib/src/75x_can.c 2008-02-17 14:54:15 UTC (rev 845)
@@ -552,13 +552,13 @@
if (pCanMsg->IdType == CAN_STD_ID)
{
- /* standard ID*/
+ /* standard ID */
CAN->sMsgObj[0].A1R = 0;
CAN->sMsgObj[0].A2R = (CAN->sMsgObj[0].A2R & 0xE000) | STD_FIXED_ID_ARB(pCanMsg->Id);
}
else
{
- /* extended ID Fixed AKHE*/
+ /* extended ID Fixed AKHE */
//CAN->sMsgObj[0].A1R = EXT_FIXED_ID_ARB_L(pCanMsg->Id);
//CAN->sMsgObj[0].A2R = ((CAN->sMsgObj[0].A2R) & 0xE000) | EXT_FIXED_ID_ARB_H(pCanMsg->Id);
CAN->sMsgObj[0].A1R = pCanMsg->Id & 0xffff;
Modified: trunk/firmware/arm/str/dosubst.bat
===================================================================
--- trunk/firmware/arm/str/dosubst.bat 2008-02-17 12:24:27 UTC (rev 844)
+++ trunk/firmware/arm/str/dosubst.bat 2008-02-17 14:54:15 UTC (rev 845)
@@ -1,4 +1,16 @@
rem use setenv_vscp.bat in VSCP root to set j to the correct folder
rem
+
+rem gcc
+rem ===
+
subst k: "C:/Program Files/yagarto/arm-elf"
set INCLUDE = "C:\Program Files\yagarto\arm-elf\include;j:\common"
+
+rem openocd
+rem =======
+rem if openocd-ftd2xx.exe is not in the path add it or edit the str makefile to point at it
+
+rem openocd does not handle long paths so we have to do this to make them
+rem shorter.
+subst l: d:\development\vscp\firmware\arm\str\common\openocd\windows
Modified: trunk/setenv_vscp.bat
===================================================================
--- trunk/setenv_vscp.bat 2008-02-17 12:24:27 UTC (rev 844)
+++ trunk/setenv_vscp.bat 2008-02-17 14:54:15 UTC (rev 845)
@@ -1,2 +1,6 @@
subst i: D:\development\vscp
-subst j: D:\development\vscp\firmware
\ No newline at end of file
+subst j: D:\development\vscp\firmware
+
+rem Setup gcc arm development paths etc
+subst k: "C:/Program Files/yagarto/arm-elf"
+set INCLUDE = "C:\Program Files\yagarto\arm-elf\include;j:\common"
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
