From: Ivan Pang <i-pang@ti.com>
Date: Mon, 14 Mar 2016 20:59:42 +0000 (-0500)
Subject: K2G flashwriters: add SOC_K2G ifdefs in places where depreciated DEVICE_K2G appears
X-Git-Tag: DEV.TOOLS.03.01.04.08^0
X-Git-Url: https://git.ti.com/gitweb?p=keystone-rtos%2Fmcsdk-tools.git;a=commitdiff_plain;h=c5a56ec5732e9102249429fc463b9dfda87d64b9;hp=bdacef02ea7436ba5d6af29080efc0f8fd256990

K2G flashwriters: add SOC_K2G ifdefs in places where depreciated DEVICE_K2G appears

Signed-off-by: Ivan Pang <i-pang@ti.com>
---

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 ()
      p_device = platform_device_open(PLATFORM_DEVID_MT29F4G08ABADA, nandWriterInfo.flags);
 #elif defined(DEVICE_K2L)
      p_device = platform_device_open(PLATFORM_DEVID_MT29F16G08ADBCAH4C, nandWriterInfo.flags);
-#elif defined(DEVICE_K2G)
+#elif (defined(DEVICE_K2G) || defined(SOC_K2G))
      p_device = platform_device_open(PLATFORM_DEVID_MT29F2G16ABAFA, nandWriterInfo.flags);
 #else
     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 ()
     }
 #if !(defined(_EVMC6657L_))
 
-#if (defined(DEVICE_K2G))
+#if (defined(DEVICE_K2G) || defined(SOC_K2G))
     p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128A13ESF40F, 0);
 #else
     p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128, 0);