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 458796be306167549b6ef0ef762d399d86d35d6a..ff863b1db817a0c81934514ca5bec846a5ce0ac8 100755 (executable)
--- 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);\r
 #elif defined(DEVICE_K2L)\r
      p_device = platform_device_open(PLATFORM_DEVID_MT29F16G08ADBCAH4C, nandWriterInfo.flags);\r
      p_device = platform_device_open(PLATFORM_DEVID_MT29F4G08ABADA, nandWriterInfo.flags);\r
 #elif defined(DEVICE_K2L)\r
      p_device = platform_device_open(PLATFORM_DEVID_MT29F16G08ADBCAH4C, nandWriterInfo.flags);\r

-#elif defined(DEVICE_K2G)\r
+#elif (defined(DEVICE_K2G) || defined(SOC_K2G))\r

      p_device = platform_device_open(PLATFORM_DEVID_MT29F2G16ABAFA, nandWriterInfo.flags);\r
 #else\r
     p_device = platform_device_open(PLATFORM_DEVID_NAND512R3A2D, 0);\r
      p_device = platform_device_open(PLATFORM_DEVID_MT29F2G16ABAFA, nandWriterInfo.flags);\r
 #else\r
     p_device = platform_device_open(PLATFORM_DEVID_NAND512R3A2D, 0);\r

diff --git a/writer/nor/src/norwriter.c b/writer/nor/src/norwriter.c
index c3835a9c6e212d76d33919f4c91e4d2223e4f137..91aca5635a41c6728c1f3f8448c827a6b34e7ede 100644 (file)
--- a/writer/nor/src/norwriter.c
+++ b/writer/nor/src/norwriter.c
@@ -442,7 +442,7 @@ void main ()
     }\r
 #if !(defined(_EVMC6657L_))\r
 \r
     }\r
 #if !(defined(_EVMC6657L_))\r
 \r

-#if (defined(DEVICE_K2G))\r
+#if (defined(DEVICE_K2G) || defined(SOC_K2G))\r

     p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128A13ESF40F, 0);\r
 #else\r
     p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128, 0);\r
     p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128A13ESF40F, 0);\r
 #else\r
     p_device = platform_device_open(PLATFORM_DEVID_NORN25Q128, 0);\r