PIC32MX: update cfg script

The default config script will now dynamically setup the BMX registers
in the reset init script.
This will also work if the user overrides the default working area.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>

diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg
index 0f1fa66c0548ddcec33c4add04cebdd9b3aaf5e8..d77c3a8c9ae95bce54324e1355909a6a9ded5563 100644 (file)
--- a/tcl/target/pic32mx.cfg
+++ b/tcl/target/pic32mx.cfg
@@ -18,14 +18,14 @@ if { [info exists CPUTAPID ] } {
    set _CPUTAPID 0x30938053
 }
 
-# working area is 16384 - 2048
-# loose first 2048 bytes due to BMXDKPBA reg
+# default working area is 16384
 if { [info exists WORKAREASIZE] } {
    set  _WORKAREASIZE $WORKAREASIZE
 } else {
-   set  _WORKAREASIZE [expr (16384 - 2048)]
+   set  _WORKAREASIZE 0x4000
 }
 
+
 jtag_nsrst_delay 100
 jtag_ntrst_delay 100
 
@@ -39,22 +39,35 @@ jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_C
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME mips_m4k -endian $_ENDIAN -chain-position $_TARGETNAME
 
-$_TARGETNAME configure -work-area-phys 0xa0000800 -work-area-size $_WORKAREASIZE -work-area-backup 0
+#
+# At reset the pic32mx does not allow code execution from RAM
+# we have to setup the BMX registers to allow this.
+# One limitation is that we loose the first 2k of RAM.
+#
+
+global _PIC32MX_DATASIZE
+global _PIC32MX_PROGSIZE
+set _PIC32MX_DATASIZE 0x800
+set _PIC32MX_PROGSIZE [expr ($_WORKAREASIZE - $_PIC32MX_DATASIZE)]
 
+$_TARGETNAME configure -work-area-phys 0xa0000800 -work-area-size $_PIC32MX_PROGSIZE -work-area-backup 0
 $_TARGETNAME configure -event reset-init {
        #
        # from reset the pic32 cannot execute code in ram - enable ram execution
        # minimum offset from start of ram is 2k
        #
 
+       global _PIC32MX_DATASIZE
+       global _PIC32MX_PROGSIZE
+
        # BMXCON
        mww 0xbf882000 0x001f0040
-       # BMXDKPBA: 0xa0000800
-       mww 0xbf882010 0x00000800
-       # BMXDUDBA
-       mww 0xbf882020 0x00004000
-       # BMXDUPBA
-       mww 0xbf882030 0x00004000
+       # BMXDKPBA: 2k kernel data @ 0xa0000800
+       mww 0xbf882010 $_PIC32MX_DATASIZE
+       # BMXDUDBA: 16k kernel program @ 0xa0000800
+       mww 0xbf882020 $_PIC32MX_PROGSIZE
+       # BMXDUPBA: 0k user program
+       mww 0xbf882030 $_PIC32MX_PROGSIZE
 }
 
 set _FLASHNAME $_CHIPNAME.flash