diff --git a/tcl/board/dm355evm.cfg b/tcl/board/dm355evm.cfg
index bb745005c2fa7703b1e36db1acda63b0b6a3c4f1..8b126fa14f86d6364963adcb5d5b5cee960e4fde 100644
--- a/tcl/board/dm355evm.cfg
+++ b/tcl/board/dm355evm.cfg
@@ -191,8 +191,8 @@ 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 0 0x02000000 hwecc4 0x01e10000
-nand device davinci 0 0x02004000 hwecc4 0x01e10000
+nand device davinci $_TARGETNAME 0x02000000 hwecc4 0x01e10000
+nand device davinci $_TARGETNAME 0x02004000 hwecc4 0x01e10000
 
 # FIXME
 #  - support writing UBL with its header (new layout only with new ROMs)