- fix at91rm9200 warning. Thanks Zach Welch <zw@superlucidity.net>

- add missing svn props from previous commit

git-svn-id: svn://svn.berlios.de/openocd/trunk@1478 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c
index 17523d871bfff8de2ebd39e573389a031522a1fd..dce7c7cd25831327178db99f9576f2d2db34365f 100644 (file)
--- a/src/jtag/at91rm9200.c
+++ b/src/jtag/at91rm9200.c
@@ -104,7 +104,7 @@ struct device_t
 struct device_t devices[] =
 {
        { "rea_ecr", PIOD, P27, PIOA, NC, PIOD, P23, PIOD, P24, PIOD, P26, PIOC, P5 },
 struct device_t devices[] =
 {
        { "rea_ecr", PIOD, P27, PIOA, NC, PIOD, P23, PIOD, P24, PIOD, P26, PIOC, P5 },

-       { NULL, 0 }
+       { .name = NULL },

 };
 
 /* configuration */
 };
 
 /* configuration */

diff --git a/src/target/target/lpc2124.cfg b/src/target/target/lpc2124.cfg
index f8d7e8f6432749a212ef203adf3e098e88b7d7ef..c780664d25cbfa56088cd7e60a2f56323f18d769 100644 (file)
--- a/src/target/target/lpc2124.cfg
+++ b/src/target/target/lpc2124.cfg
@@ -1,38 +1,38 @@
-#LPC-2124 CPU\r
-\r
-if { [info exists CHIPNAME] } {\r
-   set  _CHIPNAME $CHIPNAME\r
-} else {\r
-   set  _CHIPNAME lpc2124\r
-}\r
-\r
-if { [info exists ENDIAN] } {\r
-   set  _ENDIAN $ENDIAN\r
-} else {\r
-   set  _ENDIAN little\r
-}\r
-\r
-if { [info exists CPUTAPID ] } {\r
-   set _CPUTAPID $CPUTAPID\r
-} else {\r
-  # force an error till we get a good number\r
-    set _CPUTAPID 0x4f1f0f0f\r
-}\r
-\r
-\r
-#use combined on interfaces or targets that can't set TRST/SRST separately\r
-reset_config trst_and_srst srst_pulls_trst\r
-jtag_nsrst_delay 10\r
-jtag_khz 1000\r
-\r
-#jtag scan chain\r
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID\r
-\r
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]\r
-target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4\r
-\r
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0\r
-\r
-\r
-#flash bank <driver> <base> <size> <chip_width> <bus_width>\r
-flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v1 14745 calc_checksum\r
+#LPC-2124 CPU
+
+if { [info exists CHIPNAME] } {
+   set  _CHIPNAME $CHIPNAME
+} else {
+   set  _CHIPNAME lpc2124
+}
+
+if { [info exists ENDIAN] } {
+   set  _ENDIAN $ENDIAN
+} else {
+   set  _ENDIAN little
+}
+
+if { [info exists CPUTAPID ] } {
+   set _CPUTAPID $CPUTAPID
+} else {
+  # force an error till we get a good number
+    set _CPUTAPID 0x4f1f0f0f
+}
+
+
+#use combined on interfaces or targets that can't set TRST/SRST separately
+reset_config trst_and_srst srst_pulls_trst
+jtag_nsrst_delay 10
+jtag_khz 1000
+
+#jtag scan chain
+jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+
+set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4
+
+$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
+
+
+#flash bank <driver> <base> <size> <chip_width> <bus_width>
+flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v1 14745 calc_checksum

diff --git a/src/target/target/lpc2378.cfg b/src/target/target/lpc2378.cfg
index 386fae072e1966b4434ede4d6154540814d2a48b..16232383e261a6ea4e3baadba8a2f8ae1f3b8810 100644 (file)
--- a/src/target/target/lpc2378.cfg
+++ b/src/target/target/lpc2378.cfg
@@ -1,49 +1,49 @@
-# NXP LPC2378 ARM7TDMI-S with 512kB Flash and 32kB Local On-Chip SRAM (58kB total), clocked with 4MHz internal RC oscillator\r
-\r
-if { [info exists CHIPNAME] } {\r
-       set  _CHIPNAME $CHIPNAME\r
-} else {\r
-       set  _CHIPNAME lpc2378\r
-}\r
-\r
-if { [info exists ENDIAN] } {\r
-       set  _ENDIAN $ENDIAN\r
-} else {\r
-       set  _ENDIAN little\r
-}\r
-\r
-if { [info exists CPUTAPID ] } {\r
-       set _CPUTAPID $CPUTAPID\r
-} else {\r
-       set _CPUTAPID 0x4f1f0f0f\r
-}\r
-\r
-#delays on reset lines\r
-jtag_nsrst_delay 200\r
-jtag_ntrst_delay 200\r
-\r
-# LPC2000 -> SRST causes TRST\r
-reset_config trst_and_srst srst_pulls_trst\r
-\r
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID\r
-\r
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]\r
-target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4\r
-\r
-# LPC2378 has 32kB of SRAM on its main system bus (so-called Local On-Chip SRAM)\r
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x8000 -work-area-backup 0\r
-\r
-$_TARGETNAME configure -event reset-init {\r
-       # Force target into ARM state\r
-       soft_reset_halt\r
-       #do not remap 0x0000-0x0020 to anything but the flash\r
-       mwb 0xE01FC040 0x01\r
-}\r
-\r
-# LPC2378 has 512kB of FLASH, but upper 8kB are occupied by bootloader.\r
-# After reset the chip uses its internal 4MHz RC oscillator\r
-#flash bank lpc2000 <base> <size> 0 0 <target#> <variant>\r
-flash bank lpc2000 0x0 0x0007D000 0 0 0 lpc2000_v2 4000 calc_checksum\r
-\r
-# 4MHz / 6 = 666kHz, so use 500\r
-jtag_khz 500\r
+# NXP LPC2378 ARM7TDMI-S with 512kB Flash and 32kB Local On-Chip SRAM (58kB total), clocked with 4MHz internal RC oscillator
+
+if { [info exists CHIPNAME] } {
+       set  _CHIPNAME $CHIPNAME
+} else {
+       set  _CHIPNAME lpc2378
+}
+
+if { [info exists ENDIAN] } {
+       set  _ENDIAN $ENDIAN
+} else {
+       set  _ENDIAN little
+}
+
+if { [info exists CPUTAPID ] } {
+       set _CPUTAPID $CPUTAPID
+} else {
+       set _CPUTAPID 0x4f1f0f0f
+}
+
+#delays on reset lines
+jtag_nsrst_delay 200
+jtag_ntrst_delay 200
+
+# LPC2000 -> SRST causes TRST
+reset_config trst_and_srst srst_pulls_trst
+
+jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+
+set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4
+
+# LPC2378 has 32kB of SRAM on its main system bus (so-called Local On-Chip SRAM)
+$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x8000 -work-area-backup 0
+
+$_TARGETNAME configure -event reset-init {
+       # Force target into ARM state
+       soft_reset_halt
+       #do not remap 0x0000-0x0020 to anything but the flash
+       mwb 0xE01FC040 0x01
+}
+
+# LPC2378 has 512kB of FLASH, but upper 8kB are occupied by bootloader.
+# After reset the chip uses its internal 4MHz RC oscillator
+#flash bank lpc2000 <base> <size> 0 0 <target#> <variant>
+flash bank lpc2000 0x0 0x0007D000 0 0 0 lpc2000_v2 4000 calc_checksum
+
+# 4MHz / 6 = 666kHz, so use 500
+jtag_khz 500