This is an automated email from Gerrit.
Spencer Oliver (s...@spen-soft.co.uk) just uploaded a new patch set to Gerrit,
which you can find at http://openocd.zylin.com/30
-- gerrit
commit 7b54c467d52cca17d62c40e15a063437be647605
Author: Spencer Oliver <s...@spen-soft.co.uk>
Date: Mon Oct 17 22:04:21 2011 +0100
luminary: add peripheral reset script
some luminary device classes require a reset script
to emulate a hardware reset.
Change-Id: Id505c92451244b48b0238c2130aebab2df8d208b
Signed-off-by: Spencer Oliver <s...@spen-soft.co.uk>
diff --git a/tcl/chip/ti/lm3s/lm3s.tcl b/tcl/chip/ti/lm3s/lm3s.tcl
new file mode 100644
index 0000000..42da8c6
--- /dev/null
+++ b/tcl/chip/ti/lm3s/lm3s.tcl
@@ -0,0 +1 @@
+source [find chip/ti/lm3s/lm3s_regs.tcl]
diff --git a/tcl/chip/ti/lm3s/lm3s_regs.tcl b/tcl/chip/ti/lm3s/lm3s_regs.tcl
new file mode 100644
index 0000000..cb20812
--- /dev/null
+++ b/tcl/chip/ti/lm3s/lm3s_regs.tcl
@@ -0,0 +1,84 @@
+#*****************************************************************************
+#
+# The following are defines for the System Control register addresses.
+#
+#*****************************************************************************
+
+set SYSCTL_DID0 0x400FE000 ;# Device Identification 0
+set SYSCTL_DID1 0x400FE004 ;# Device Identification 1
+set SYSCTL_DC0 0x400FE008 ;# Device Capabilities 0
+set SYSCTL_DC1 0x400FE010 ;# Device Capabilities 1
+set SYSCTL_DC2 0x400FE014 ;# Device Capabilities 2
+set SYSCTL_DC3 0x400FE018 ;# Device Capabilities 3
+set SYSCTL_DC4 0x400FE01C ;# Device Capabilities 4
+set SYSCTL_DC5 0x400FE020 ;# Device Capabilities 5
+set SYSCTL_DC6 0x400FE024 ;# Device Capabilities 6
+set SYSCTL_DC7 0x400FE028 ;# Device Capabilities 7
+set SYSCTL_DC8 0x400FE02C ;# Device Capabilities 8 ADC
+ ;# Channels
+set SYSCTL_PBORCTL 0x400FE030 ;# Brown-Out Reset Control
+set SYSCTL_LDOPCTL 0x400FE034 ;# LDO Power Control
+set SYSCTL_SRCR0 0x400FE040 ;# Software Reset Control 0
+set SYSCTL_SRCR1 0x400FE044 ;# Software Reset Control 1
+set SYSCTL_SRCR2 0x400FE048 ;# Software Reset Control 2
+set SYSCTL_RIS 0x400FE050 ;# Raw Interrupt Status
+set SYSCTL_IMC 0x400FE054 ;# Interrupt Mask Control
+set SYSCTL_MISC 0x400FE058 ;# Masked Interrupt Status and
+ ;# Clear
+set SYSCTL_RESC 0x400FE05C ;# Reset Cause
+set SYSCTL_RCC 0x400FE060 ;# Run-Mode Clock Configuration
+set SYSCTL_PLLCFG 0x400FE064 ;# XTAL to PLL Translation
+set SYSCTL_GPIOHSCTL 0x400FE06C ;# GPIO High-Speed Control
+set SYSCTL_GPIOHBCTL 0x400FE06C ;# GPIO High-Performance Bus
+ ;# Control
+set SYSCTL_RCC2 0x400FE070 ;# Run-Mode Clock Configuration 2
+set SYSCTL_MOSCCTL 0x400FE07C ;# Main Oscillator Control
+set SYSCTL_RCGC0 0x400FE100 ;# Run Mode Clock Gating Control
+ ;# Register 0
+set SYSCTL_RCGC1 0x400FE104 ;# Run Mode Clock Gating Control
+ ;# Register 1
+set SYSCTL_RCGC2 0x400FE108 ;# Run Mode Clock Gating Control
+ ;# Register 2
+set SYSCTL_SCGC0 0x400FE110 ;# Sleep Mode Clock Gating Control
+ ;# Register 0
+set SYSCTL_SCGC1 0x400FE114 ;# Sleep Mode Clock Gating Control
+ ;# Register 1
+set SYSCTL_SCGC2 0x400FE118 ;# Sleep Mode Clock Gating Control
+ ;# Register 2
+set SYSCTL_DCGC0 0x400FE120 ;# Deep Sleep Mode Clock Gating
+ ;# Control Register 0
+set SYSCTL_DCGC1 0x400FE124 ;# Deep-Sleep Mode Clock Gating
+ ;# Control Register 1
+set SYSCTL_DCGC2 0x400FE128 ;# Deep Sleep Mode Clock Gating
+ ;# Control Register 2
+set SYSCTL_DSLPCLKCFG 0x400FE144 ;# Deep Sleep Clock Configuration
+set SYSCTL_CLKVCLR 0x400FE150 ;# Clock Verification Clear
+set SYSCTL_PIOSCCAL 0x400FE150 ;# Precision Internal Oscillator
+ ;# Calibration
+set SYSCTL_PIOSCSTAT 0x400FE154 ;# Precision Internal Oscillator
+ ;# Statistics
+set SYSCTL_LDOARST 0x400FE160 ;# Allow Unregulated LDO to Reset
+ ;# the Part
+set SYSCTL_I2SMCLKCFG 0x400FE170 ;# I2S MCLK Configuration
+set SYSCTL_DC9 0x400FE190 ;# Device Capabilities 9 ADC
+ ;# Digital Comparators
+set SYSCTL_NVMSTAT 0x400FE1A0 ;# Non-Volatile Memory Information
+
+set SYSCTL_RCC_USESYSDIV 0x00400000 ;# Enable System Clock Divider
+set SYSCTL_RCC2_BYPASS2 0x00000800 ;# PLL Bypass 2
+set SYSCTL_RCC_MOSCDIS 0x00000001 ;# Main Oscillator Disable
+
+set SYSCTL_SRCR0 0x400FE040 ;# Software Reset Control 0
+set SYSCTL_SRCR1 0x400FE044 ;# Software Reset Control 1
+set SYSCTL_SRCR2 0x400FE048 ;# Software Reset Control 2
+
+set SYSCTL_MISC 0x400FE058 ;# Masked Interrupt Status and Clear
+
+set FLASH_FMA 0x400FD000 ;# Flash Memory Address
+set FLASH_FMD 0x400FD004 ;# Flash Memory Data
+set FLASH_FMC 0x400FD008 ;# Flash Memory Control
+set FLASH_FCRIS 0x400FD00C ;# Flash Controller Raw Interrupt
Status
+set FLASH_FCIM 0x400FD010 ;# Flash Controller Interrupt Mask
+set FLASH_FCMISC 0x400FD014 ;# Flash Controller Masked Interrupt
Status and Clear
+set FLASH_FMC2 0x400FD020 ;# Flash Memory Control 2
+set FLASH_FWBVAL 0x400FD030 ;# Flash Write Buffer Valid
diff --git a/tcl/target/stellaris.cfg b/tcl/target/stellaris.cfg
index b985de0..7fef4ec 100644
--- a/tcl/target/stellaris.cfg
+++ b/tcl/target/stellaris.cfg
@@ -70,6 +70,65 @@ adapter_khz 500
source [find mem_helper.tcl]
+proc reset_peripherals {family} {
+
+ source [find chip/ti/lm3s/lm3s.tcl]
+
+ echo "Resetting Core Peripherals"
+
+ # Disable the PLL and the system clock divider (nop if disabled)
+ mmw $SYSCTL_RCC 0 $SYSCTL_RCC_USESYSDIV
+ mmw $SYSCTL_RCC2 $SYSCTL_RCC2_BYPASS2 0
+
+ # RCC and RCC2 to their reset values
+ mww $SYSCTL_RCC [expr (0x078e3ad0 | ([mrw $SYSCTL_RCC] &
$SYSCTL_RCC_MOSCDIS))]
+ mww $SYSCTL_RCC2 0x07806810
+ mww $SYSCTL_RCC 0x078e3ad1
+
+ # Reset the deep sleep clock configuration register
+ mww $SYSCTL_DSLPCLKCFG 0x07800000
+
+ # Reset the clock gating registers
+ mww $SYSCTL_RCGC0 0x00000040
+ mww $SYSCTL_RCGC1 0
+ mww $SYSCTL_RCGC2 0
+ mww $SYSCTL_SCGC0 0x00000040
+ mww $SYSCTL_SCGC1 0
+ mww $SYSCTL_SCGC2 0
+ mww $SYSCTL_DCGC0 0x00000040
+ mww $SYSCTL_DCGC1 0
+ mww $SYSCTL_DCGC2 0
+
+ # Reset the remaining SysCtl registers
+ mww $SYSCTL_PBORCTL 0
+ mww $SYSCTL_IMC 0
+ mww $SYSCTL_GPIOHBCTL 0
+ mww $SYSCTL_MOSCCTL 0
+ mww $SYSCTL_PIOSCCAL 0
+ mww $SYSCTL_I2SMCLKCFG 0
+
+ # Reset the peripherals
+ mww $SYSCTL_SRCR0 0xffffffff
+ mww $SYSCTL_SRCR1 0xffffffff
+ mww $SYSCTL_SRCR2 0xffffffff
+ mww $SYSCTL_SRCR0 0
+ mww $SYSCTL_SRCR1 0
+ mww $SYSCTL_SRCR2 0
+
+ # Clear any pending SysCtl interrupts
+ mww $SYSCTL_MISC 0xffffffff
+
+ # Wait for any pending flash operations to complete
+ while {[expr [mrw $FLASH_FMC] & 0xffff] != 0} { sleep 1 }
+ while {[expr [mrw $FLASH_FMC2] & 0xffff] != 0} { sleep 1 }
+
+ # Reset the flash controller registers
+ mww $FLASH_FMA 0
+ mww $FLASH_FCIM 0
+ mww $FLASH_FCMISC 0xffffffff
+ mww $FLASH_FWBVAL 0
+}
+
$_TARGETNAME configure -event reset-start {
adapter_khz 500
@@ -99,12 +158,14 @@ $_TARGETNAME configure -event reset-start {
cortex_m3 reset_config sysresetreq
} else {
# Tempest and newer default to using NVIC VECTRESET
- # this does mean a reset-init event handler is required to reset
- # any peripherals
+ # peripherals will need reseting manually, see proc
reset_peripherals
cortex_m3 reset_config vectreset
+
+ # reset peripherals, based on code in
+ # http://www.ti.com/lit/er/spmz573a/spmz573a.pdf
+ reset_peripherals $device_class
}
}
# flash configuration ... autodetects sizes, autoprobed
flash bank $_CHIPNAME.flash stellaris 0 0 0 0 $_TARGETNAME
-
--
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
