From a0cce48282f8914cdf40406e059e3c256c7edc32 Mon Sep 17 00:00:00 2001
From: Brian Daniels <brianddaniels@gmail.com>
Date: Fri, 8 Mar 2019 15:41:23 -0600
Subject: [PATCH] Modify uvision templates to conditionally enable post build

---
 tools/export/uvision/uvision.tmpl       |  6 +++---
 tools/export/uvision/uvision_debug.tmpl | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/export/uvision/uvision.tmpl b/tools/export/uvision/uvision.tmpl
index 767ace3489..c2261a6495 100644
--- a/tools/export/uvision/uvision.tmpl
+++ b/tools/export/uvision/uvision.tmpl
@@ -82,9 +82,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg1>{{postbuild_step_active}}</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
+            <UserProg1Name>{{postbuild_step if postbuild_step_active else ''}}</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -182,7 +182,7 @@
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2CM3.DLL</Flash2>
           <Flash3></Flash3>
-          <Flash4></Flash4>
+          <Flash4>{{'./flash_init.ini' if postbuild_step_active else ''}}</Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
diff --git a/tools/export/uvision/uvision_debug.tmpl b/tools/export/uvision/uvision_debug.tmpl
index 60bd1e6f8e..c5d7f43467 100644
--- a/tools/export/uvision/uvision_debug.tmpl
+++ b/tools/export/uvision/uvision_debug.tmpl
@@ -6,11 +6,20 @@
 		<ToolsetNumber>0x4</ToolsetNumber>
 		<ToolsetName>ARM-ADS</ToolsetName>
 		<TargetOption>
+			{% if postbuild_step_active %}
+			<OPTTT>
+				<RunAbUc>1</RunAbUc>
+			</OPTTT>
+			{% endif %}
 			<DebugOpt>
 				<uSim>0</uSim>
 				<uTrg>1</uTrg>
 				<nTsel>11</nTsel>
 				<pMon>{{device.debug_interface.bin_loc}}</pMon>
+				{% if postbuild_step_active %}
+				<tIfile>./debug_init.ini</tIfile>
+				<tLdApp>0</tLdApp>
+				{% endif %}
 			</DebugOpt>
 			<TargetDriverDllRegistry>
 				<SetRegEntry>
@@ -21,4 +30,4 @@
 			</TargetDriverDllRegistry>
 		</TargetOption>
 	</Target>
-</ProjectOpt>
\ No newline at end of file
+</ProjectOpt>