summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Pang2016-03-14 15:59:42 -0500
committerIvan Pang2016-03-14 15:59:42 -0500
commitc5a56ec5732e9102249429fc463b9dfda87d64b9 (patch)
treeb1d4a309503922f52a689626b5b6a6c539fd496d
parentbdacef02ea7436ba5d6af29080efc0f8fd256990 (diff)
downloadmcsdk-tools-c5a56ec5732e9102249429fc463b9dfda87d64b9.tar.gz
mcsdk-tools-c5a56ec5732e9102249429fc463b9dfda87d64b9.tar.xz
mcsdk-tools-c5a56ec5732e9102249429fc463b9dfda87d64b9.zip
K2G flashwriters: add SOC_K2G ifdefs in places where depreciated DEVICE_K2G appearsDEV.TOOLS.03.01.04.08
Signed-off-by: Ivan Pang <i-pang@ti.com>
-rwxr-xr-xwriter/nand/src/nandwriter.c2
-rw-r--r--writer/nor/src/norwriter.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/writer/nand/src/nandwriter.c b/writer/nand/src/nandwriter.c
index 458796b..ff863b1 100755
--- a/writer/nand/src/nandwriter.c
+++ b/writer/nand/src/nandwriter.c
@@ -614,7 +614,7 @@ void main ()
614 p_device = platform_device_open(PLATFORM_DEVID_MT29F4G08ABADA, nandWriterInfo.flags); 614 p_device = platform_device_open(PLATFORM_DEVID_MT29F4G08ABADA, nandWriterInfo.flags);
615#elif defined(DEVICE_K2L) 615#elif defined(DEVICE_K2L)
616 p_device = platform_device_open(PLATFORM_DEVID_MT29F16G08ADBCAH4C, nandWriterInfo.flags); 616 p_device = platform_device_open(PLATFORM_DEVID_MT29F16G08ADBCAH4C, nandWriterInfo.flags);
617#elif defined(DEVICE_K2G) 617#elif (defined(DEVICE_K2G) || defined(SOC_K2G))
618 p_device = platform_device_open(PLATFORM_DEVID_MT29F2G16ABAFA, nandWriterInfo.flags); 618 p_device = platform_device_open(PLATFORM_DEVID_MT29F2G16ABAFA, nandWriterInfo.flags);
619#else 619#else
620 p_device = platform_device_open(PLATFORM_DEVID_NAND512R3A2D, 0); 620 p_device = platform_device_open(PLATFORM_DEVID_NAND512R3A2D, 0);
diff --git a/writer/nor/src/norwriter.c b/writer/nor/src/norwriter.c
index c3835a9..91aca56 100644
--- a/writer/nor/src/norwriter.c
+++ b/writer/nor/src/norwriter.c
@@ -442,7 +442,7 @@ void main ()
442 } 442 }
443#if !(defined(_EVMC6657L_)) 443#if !(defined(_EVMC6657L_))
444 444
445#if (defined(DEVICE_K2G)) 445#if (defined(DEVICE_K2G) || defined(SOC_K2G))
446 p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128A13ESF40F, 0); 446 p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128A13ESF40F, 0);
447#else 447#else
448 p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128, 0); 448 p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128, 0);