remove srst_pulls_trst from LPC2xxx target scripts

[fw/openocd] / tcl / target / davinci.cfg

diff --git a/tcl/target/davinci.cfg b/tcl/target/davinci.cfg
index 11ae093f56cf779e5e73603795b60f64b7d1903d..9e9369dc185c7c35fd16f0ec66f339b37b587df1 100644 (file)
--- a/tcl/target/davinci.cfg
+++ b/tcl/target/davinci.cfg
@@ -7,20 +7,7 @@ proc davinci_pinmux {soc reg value} {
        mww [expr [dict get $soc sysbase] + 4 * $reg] $value
 }
 
-# mrw: "memory read word", returns value of $reg
-proc mrw {reg} {
-       set value ""
-       mem2array value 32 $reg 1
-       return $value(0)
-}
-
-# mmw: "memory modify word", updates value of $reg
-#      $reg <== ((value & ~$clearbits) | $setbits)
-proc mmw {reg setbits clearbits} {
-       set old [mrw $reg]
-       set new [expr ($old & ~$clearbits) | $setbits]
-       mww $reg $new
-}
+source [find mem_helper.tcl]
 
 #
 # pll_setup: initialize PLL
@@ -222,6 +209,13 @@ proc pll_v03_setup {pll_addr mult config} {
        } else {
                mww [expr $pll_addr + 0x0120] 0
        }
+       if { [dict exists $config oscdiv] } {
+               set div [dict get $config oscdiv]
+               set div [expr 0x8000 | ($div - 1)]
+               mww [expr $pll_addr + 0x0124] $div
+       } else {
+               mww [expr $pll_addr + 0x0124] 0
+       }
        if { [dict exists $config div4] } {
                set div [dict get $config div4]
                set div [expr 0x8000 | ($div - 1)]