From: Øyvind H. <go...@us...> - 2009-10-14 11:05:30
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 77ca2f3a702c7a9cfceba14166042a0ed09947fe (commit) via bc5eae23c5b7e14edc273da30bf4bce06a269a9b (commit) from 5ae48dba487b76162c2d108193241e34330abe5b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 77ca2f3a702c7a9cfceba14166042a0ed09947fe Author: Ãyvind Harboe <oyv...@zy...> Date: Wed Oct 14 10:34:41 2009 +0200 iMX target config script's ported from Freescale BSP. diff --git a/tcl/board/imx31pdk.cfg b/tcl/board/imx31pdk.cfg index e000e3c..4dfa4db 100644 --- a/tcl/board/imx31pdk.cfg +++ b/tcl/board/imx31pdk.cfg @@ -1,59 +1,47 @@ # The IMX31PDK eval board has a single IMX31 chip source [find target/imx31.cfg] +source [find target/imx.cfg] $_TARGETNAME configure -event reset-init { imx31pdk_init } proc imx31pdk_init { } { + + imx3x_reset + # This setup puts RAM at 0x80000000 - # ======================================== - # Init CCM - # ======================================== mww 0x53FC0000 0x040 mww 0x53F80000 0x074B0B7D - - sleep 100 - - # ======================================== + # 399MHz - 26MHz input, PD=1,MFI=7, MFN=27, MFD=40 - # ======================================== - mww 0x53F80004 0xFF871D50 - mww 0x53F80010 0x00271C1B - - # ======================================== - # Configure CPLD on CS5 - # ======================================== - mww 0xb8002050 0x0000DCF6 - mww 0xb8002054 0x444A4541 - mww 0xb8002058 0x44443302 - - # ======================================== + #mww 0x53F80004 0xFF871D50 + #mww 0x53F80010 0x00271C1B + + # Start 16 bit NorFlash Initialization on CS0 + mww 0xb8002000 0x0000CC03 + mww 0xb8002004 0xa0330D01 + mww 0xb8002008 0x00220800 + + # Configure CPLD on CS4 + mww 0xb8002040 0x0000DCF6 + mww 0xb8002044 0x444A4541 + mww 0xb8002048 0x44443302 + # SDCLK - # ======================================== mww 0x43FAC26C 0 - - # ======================================== + # CAS - # ======================================== mww 0x43FAC270 0 - - # ======================================== + # RAS - # ======================================== mww 0x43FAC274 0 - - # ======================================== + # CS2 (CSD0) - # ======================================== mww 0x43FAC27C 0x1000 - - # ======================================== + # DQM3 - # ======================================== mww 0x43FAC284 0 - - # ======================================== + # DQM2, DQM1, DQM0, SD31-SD0, A25-A0, MA10 (0x288..0x2DC) - # ======================================== mww 0x43FAC288 0 mww 0x43FAC28C 0 mww 0x43FAC290 0 @@ -76,10 +64,8 @@ proc imx31pdk_init { } { mww 0x43FAC2D4 0 mww 0x43FAC2D8 0 mww 0x43FAC2DC 0 - - # ======================================== - # Initialization script for 32 bit DDR on MX31 PDK - # ======================================== + + # Initialization script for 32 bit DDR on MX31 ADS mww 0xB8001010 0x00000004 mww 0xB8001004 0x006ac73a mww 0xB8001000 0x92100000 diff --git a/tcl/board/imx35pdk.cfg b/tcl/board/imx35pdk.cfg index 7724bac..e5891c8 100644 --- a/tcl/board/imx35pdk.cfg +++ b/tcl/board/imx35pdk.cfg @@ -1,35 +1,11 @@ # The IMX35PDK eval board has a single IMX35 chip source [find target/imx35.cfg] +source [find target/imx.cfg] $_TARGETNAME configure -event reset-init { imx35pdk_init } - -global TARGETNAME -set TARGETNAME $_TARGETNAME - -# rewrite commands of the form below to arm11 mcr... -# Data.Set c15:0x042f %long 0x40000015 -proc setc15 {regs value} { - global TARGETNAME - - echo [format "set p15 0x%04x, 0x%08x" $regs $value] - - arm11 mcr $TARGETNAME 15 [expr ($regs>>12)&0x7] [expr ($regs>>0)&0xf] [expr ($regs>>4)&0xf] [expr ($regs>>8)&0x7] $value -} - proc imx35pdk_init { } { - # this reset script comes from the Freescale PDK - # - # http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX35PDK - - echo "Target Setup: initialize DRAM controller and peripherals" - -# Data.Set c15:0x01 %long 0x00050078 - setc15 0x01 0x00050078 - - echo "configuring CP15 for enabling the peripheral bus" -# Data.Set c15:0x042f %long 0x40000015 - setc15 0x042f 0x40000015 + imx3x_reset mww 0x43f00040 0x00000000 mww 0x43f00044 0x00000000 diff --git a/tcl/target/imx.cfg b/tcl/target/imx.cfg new file mode 100644 index 0000000..16773fa --- /dev/null +++ b/tcl/target/imx.cfg @@ -0,0 +1,30 @@ +# utility fn's for Freescale i.MX series + +global TARGETNAME +set TARGETNAME $_TARGETNAME + +# rewrite commands of the form below to arm11 mcr... +# Data.Set c15:0x042f %long 0x40000015 +proc setc15 {regs value} { + global TARGETNAME + + echo [format "set p15 0x%04x, 0x%08x" $regs $value] + + arm11 mcr $TARGETNAME 15 [expr ($regs>>12)&0x7] [expr ($regs>>0)&0xf] [expr ($regs>>4)&0xf] [expr ($regs>>8)&0x7] $value +} + + +proc imx3x_reset {} { + # this reset script comes from the Freescale PDK + # + # http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX35PDK + + echo "Target Setup: initialize DRAM controller and peripherals" + +# Data.Set c15:0x01 %long 0x00050078 + setc15 0x01 0x00050078 + + echo "configuring CP15 for enabling the peripheral bus" +# Data.Set c15:0x042f %long 0x40000015 + setc15 0x042f 0x40000015 +} commit bc5eae23c5b7e14edc273da30bf4bce06a269a9b Author: David Brownell <da...@pa...> Date: Wed Oct 14 09:32:42 2009 +0200 Fix problems building xscale_debug.S diff --git a/src/target/Makefile.am b/src/target/Makefile.am index 86716dc..a2c34f0 100644 --- a/src/target/Makefile.am +++ b/src/target/Makefile.am @@ -10,6 +10,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/jtag \ -I$(top_srcdir)/src/xsvf +# ideally this would be specific to xscale_debug.S ... +libtarget_la_CCASFLAGS = \ + -Wa,-I$(top_srcdir)/src/target \ + $(AM_CCASFLAGS) + + METASOURCES = AUTO noinst_LTLIBRARIES = libtarget.la libtarget_la_SOURCES = \ ----------------------------------------------------------------------- Summary of changes: src/target/Makefile.am | 6 ++++ tcl/board/imx31pdk.cfg | 64 ++++++++++++++++++----------------------------- tcl/board/imx35pdk.cfg | 28 +------------------- tcl/target/imx.cfg | 30 ++++++++++++++++++++++ 4 files changed, 63 insertions(+), 65 deletions(-) create mode 100644 tcl/target/imx.cfg hooks/post-receive -- Main OpenOCD repository |