reset: fix reset halt bug

[openocd.git] / tcl / board / sheevaplug.cfg

diff --git a/tcl/board/sheevaplug.cfg b/tcl/board/sheevaplug.cfg
index 1a3f61b885bb0549c0dbae52cc39043e629dfef5..b843213bef92764201b4ede872ada597e8b010cc 100644 (file)
--- a/tcl/board/sheevaplug.cfg
+++ b/tcl/board/sheevaplug.cfg
@@ -11,7 +11,8 @@ $_TARGETNAME configure \
 arm7_9 dcc_downloads enable
 
 # this assumes the hardware default peripherals location before u-Boot moves it
-nand device orion 0 0xd8000000
+set _FLASHNAME $_CHIPNAME.flash
+nand device $_FLASHNAME orion 0 0xd8000000
 
 proc sheevaplug_init { } {
 
@@ -28,7 +29,7 @@ proc sheevaplug_init { } {
        jtag_reset 0 0
        wait_halt
 
-       arm926ejs cp15 0 0 1 0 0x00052078
+       arm mcr 15 0 0 1 0 0x00052078
 
        mww 0xD0001400 0x43000C30 #  DDR SDRAM Configuration Register
        mww 0xD0001404 0x39543000 #  Dunit Control Low Register
@@ -110,6 +111,17 @@ proc sheevaplug_reflash_uboot { } {
 
 }
 
+proc sheevaplug_reflash_uboot_env { } {
+
+       # reflash the u-Boot environment variables area
+       sheevaplug_init
+       nand probe 0
+       nand erase 0 0xa0000 0x40000
+       nand write 0 uboot-env.bin 0xa0000 oob_softecc_kw
+       resume
+
+}
+
 proc sheevaplug_load_uboot { } {
 
        # load u-Boot into RAM and execute it