From: Zachary T Welch <zw@superlucidity.net>
Date: Wed, 18 Nov 2009 10:19:35 +0000 (-0800)
Subject: update 'nand device' usage in scripts
X-Git-Tag: v0.4.0-rc1~485
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e1f5e7c64ea545f6e87b5fa1adb0c00358be505;p=openocd

update 'nand device' usage in scripts

Add $_FLASHNAME variable to update 'nand device' command syntax.
---

diff --git a/tcl/board/dm355evm.cfg b/tcl/board/dm355evm.cfg
index 8b126fa1..1f814b2b 100644
--- a/tcl/board/dm355evm.cfg
+++ b/tcl/board/dm355evm.cfg
@@ -191,8 +191,10 @@ proc dm355evm_init {} {
 # you either (a) have 'new' DM355 chips, with boot ROMs that don't need to
 # use "hwecc4_infix" for the UBL; or else (b) aren't updating anything that
 # needs infix layout ... like an old UBL, old U-Boot, old MVL kernel, etc.
-nand device davinci $_TARGETNAME 0x02000000 hwecc4 0x01e10000
-nand device davinci $_TARGETNAME 0x02004000 hwecc4 0x01e10000
+set _FLASHNAME $_CHIPNAME.boot
+nand device $_FLASHNAME davinci $_TARGETNAME 0x02000000 hwecc4 0x01e10000
+set _FLASHNAME $_CHIPNAME.flash
+nand device $_FLASHNAME davinci $_TARGETNAME 0x02004000 hwecc4 0x01e10000
 
 # FIXME
 #  - support writing UBL with its header (new layout only with new ROMs)
diff --git a/tcl/board/openrd.cfg b/tcl/board/openrd.cfg
index a77dcdbe..e8784d40 100644
--- a/tcl/board/openrd.cfg
+++ b/tcl/board/openrd.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 openrd_init { } {
 
diff --git a/tcl/board/sheevaplug.cfg b/tcl/board/sheevaplug.cfg
index 62b78ee1..afd621a7 100644
--- 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 { } {