From d5295dbde2727c9b51f9a10c8d388750e3aa20a6 Mon Sep 17 00:00:00 2001
From: Mahesh Mahadevan <mahesh.mahadevan@nxp.com>
Date: Tue, 12 Mar 2019 07:59:24 -0500
Subject: [PATCH] LPC55S69: Add IAR and uvision exporter support

Signed-off-by: Mahesh Mahadevan <mahesh.mahadevan@nxp.com>
---
 targets/targets.json                  |   1 +
 tools/arm_pack_manager/index.json     | 104 ++++++++++++++++++++++++++
 tools/export/iar/iar_definitions.json |   3 +
 tools/export/uvision/__init__.py      |   3 +-
 4 files changed, 110 insertions(+), 1 deletion(-)

diff --git a/targets/targets.json b/targets/targets.json
index 916080df47..ef8f7633bd 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2052,6 +2052,7 @@
             "LPC"
         ],
         "detect_code": ["0236"],
+        "device_name": "LPC55S69JBD100",
         "release_versions": ["5"]
     },
     "LPC55S69_NS": {
diff --git a/tools/arm_pack_manager/index.json b/tools/arm_pack_manager/index.json
index 56259f085f..9ece566809 100644
--- a/tools/arm_pack_manager/index.json
+++ b/tools/arm_pack_manager/index.json
@@ -157016,6 +157016,110 @@
         ], 
         "vendor": "NXP:11"
     }, 
+    "LPC55S69JBD100": {
+        "algorithms": [
+            {
+                "default": false,
+                "file_name": "arm/LPC55XX_640.FLM",
+                "ram_size": 4096,
+                "ram_start": 536870912,
+                "size": 622592,
+                "start": 0
+            }
+        ],
+        "from_pack": {
+            "pack": "LPC55S69_DFP",
+            "url": "http://mcuxpresso.nxp.com/cmsis_pack/repo/",
+            "vendor": "NXP",
+            "version": "11.0.0"
+        },
+        "memories": {
+            "PROGRAM_FLASH": {
+                "access": {
+                    "execute": true,
+                    "non_secure": false,
+                    "non_secure_callable": false,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": false
+                },
+                "default": true,
+                "size": 622592,
+                "start": 0,
+                "startup": true
+            },
+            "SRAMX": {
+                "access": {
+                    "execute": false,
+                    "non_secure": false,
+                    "non_secure_callable": false,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": true
+                },
+                "default": false,
+                "size": 32768,
+                "start": 67108864,
+                "startup": false
+            },
+            "SRAM": {
+                "access": {
+                    "execute": false,
+                    "non_secure": false,
+                    "non_secure_callable": false,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": true
+                },
+                "default": true,
+                "size": 278528,
+                "start": 536870912,
+                "startup": false
+            },
+            "USB_RAM": {
+                "access": {
+                    "execute": false,
+                    "non_secure": false,
+                    "non_secure_callable": false,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": true
+                },
+                "default": false,
+                "size": 16384,
+                "start": 1074790400,
+                "startup": false
+            }
+        },
+        "name": "LPC55S69JBD100",
+        "processor": {
+            "Asymmetric": {
+                "cm33_core0": {
+                    "core": "CortexM33",
+                    "fpu": "SinglePrecision",
+                    "mpu": "Present",
+                    "units": 1
+                },
+                "cm33_core1": {
+                    "core": "CortexM33",
+                    "fpu": "None",
+                    "mpu": "NotPresent",
+                    "units": 1
+                }
+            }
+        },
+        "sectors": [
+            [
+                0,
+                32768
+            ]
+        ],
+        "vendor": "NXP:11"
+    },
     "LPC802M001JDH16": {
         "algorithms": [
             {
diff --git a/tools/export/iar/iar_definitions.json b/tools/export/iar/iar_definitions.json
index cb288feadd..9dca4c713e 100644
--- a/tools/export/iar/iar_definitions.json
+++ b/tools/export/iar/iar_definitions.json
@@ -96,6 +96,9 @@
     "LPC54628J512ET180": {
         "OGChipSelectEditMenu": "LPC54618J512\tNXP LPC54618J512"
     },
+    "LPC55S69JBD100": {
+        "OGChipSelectEditMenu": "LPC55S69_core0\tNXP LPC55S69_core0"
+    },
     "STM32F072RB": {
         "OGChipSelectEditMenu": "STM32F072RB\tST STM32F072RB"
     },
diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py
index 2cc50dcae7..ccde7b13c3 100644
--- a/tools/export/uvision/__init__.py
+++ b/tools/export/uvision/__init__.py
@@ -137,7 +137,8 @@ class Uvision(Exporter):
         "LPC4088Code.binary_hook",
         "MTSCode.combine_bins_mts_dot",
         "MTSCode.combine_bins_mts_dragonfly",
-        "NCS36510TargetCode.ncs36510_addfib"
+        "NCS36510TargetCode.ncs36510_addfib",
+        "LPC55S69Code.binary_hook"
     ])
 
     # File associations within .uvprojx file