[REL] Ready for v5.2.0

Signed-off-by: Jay Heng <[email protected]>

README-zh.md

@@ -1,6 +1,6 @@
 # NXP MCU Boot Utility
 
-[![GitHub release](https://img.shields.io/github/release/JayHeng/NXP-MCUBootUtility.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/releases/latest) [![GitHub commits](https://img.shields.io/github/commits-since/JayHeng/NXP-MCUBootUtility/v5.1.0.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/compare/v5.1.0...master) ![GitHub All Releases](https://img.shields.io/github/downloads/JayHeng/NXP-MCUBootUtility/total.svg) [![GitHub license](https://img.shields.io/github/license/JayHeng/NXP-MCUBootUtility.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/blob/master/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/JayHeng/NXP-MCUBootUtility.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/releases/latest) [![GitHub commits](https://img.shields.io/github/commits-since/JayHeng/NXP-MCUBootUtility/v5.2.0.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/compare/v5.2.0...master) ![GitHub All Releases](https://img.shields.io/github/downloads/JayHeng/NXP-MCUBootUtility/total.svg) [![GitHub license](https://img.shields.io/github/license/JayHeng/NXP-MCUBootUtility.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/blob/master/LICENSE)
 
 [English](./README.md) | 中文
 

README.md

@@ -1,6 +1,6 @@
 # NXP MCU Boot Utility
 
-[![GitHub release](https://img.shields.io/github/release/JayHeng/NXP-MCUBootUtility.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/releases/latest) [![GitHub commits](https://img.shields.io/github/commits-since/JayHeng/NXP-MCUBootUtility/v5.1.0.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/compare/v5.1.0...master) ![GitHub All Releases](https://img.shields.io/github/downloads/JayHeng/NXP-MCUBootUtility/total.svg) [![GitHub license](https://img.shields.io/github/license/JayHeng/NXP-MCUBootUtility.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/blob/master/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/JayHeng/NXP-MCUBootUtility.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/releases/latest) [![GitHub commits](https://img.shields.io/github/commits-since/JayHeng/NXP-MCUBootUtility/v5.2.0.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/compare/v5.2.0...master) ![GitHub All Releases](https://img.shields.io/github/downloads/JayHeng/NXP-MCUBootUtility/total.svg) [![GitHub license](https://img.shields.io/github/license/JayHeng/NXP-MCUBootUtility.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/blob/master/LICENSE)
 
 English | [中文](./README-zh.md)
 

src/boot/target.py

@@ -64,8 +64,10 @@ def __init__(self, cpu, board='', build='', **kwargs):
         self.flexspiNorDevice = misc.get_dict_default(kwargs, 'flexspiNorDevice', None)
         self.flexspiNorMemBase = misc.get_dict_default(kwargs, 'flexspiNorMemBase0', None)
         self.flexspiNorMemBase0 = misc.get_dict_default(kwargs, 'flexspiNorMemBase0', None)
+        self.flexspiNorMemBase0Ns = misc.get_dict_default(kwargs, 'flexspiNorMemBase0Ns', None)
         self.flexspiNorMemBase0Aliased = misc.get_dict_default(kwargs, 'flexspiNorMemBase0Aliased', None)
         self.flexspiNorMemBase1 = misc.get_dict_default(kwargs, 'flexspiNorMemBase1', None)
+        self.flexspiNorMemBase1Ns = misc.get_dict_default(kwargs, 'flexspiNorMemBase1Ns', None)
         self.flexspiNorMemBase1Aliased = misc.get_dict_default(kwargs, 'flexspiNorMemBase1Aliased', None)
         self.flexspiFreqs = misc.get_dict_default(kwargs, 'flexspiFreqs', None)
         self.xspiNorCfgInfoOffset = misc.get_dict_default(kwargs, 'xspiNorCfgInfoOffset', None)

src/gen/RTxxx_gencore.py

@@ -231,12 +231,13 @@ def RTxxx_createMatchedAppJsonfile( self ):
         self.isXipApp = False
         self.destAppVectorAddress = imageStartAddr
         if self.bootDevice == RTxxx_uidef.kBootDevice_FlexspiNor:
-            if ((imageStartAddr >= self.tgt.flexspiNorMemBase) and (imageStartAddr < self.tgt.flexspiNorMemBase + RTxxx_rundef.kBootDeviceMemXipSize_FlexspiNor)):
+            self.adjustTgtFlexspiMemBaseAccordingToApp(imageStartAddr)
+            if ((imageStartAddr >= self.tgt.flexspiNorMemBase) and (imageStartAddr < self.tgt.flexspiNorMemBase + rundef.kBootDeviceMemXipSize_FlexspiNor)):
                 if (imageStartAddr + imageLength <= self.tgt.flexspiNorMemBase + RTxxx_rundef.kBootDeviceMemXipSize_FlexspiNor):
                     self.isXipApp = True
                     self.destAppVectorOffset = imageStartAddr - self.tgt.flexspiNorMemBase
                 else:
-                    self.popupMsgBox(uilang.kMsgLanguageContentDict['srcImgError_xipSizeTooLarge'][self.languageIndex] + u"0x%s !" %(RTxxx_rundef.kBootDeviceMemXipSize_FlexspiNor))
+                    self.popupMsgBox(uilang.kMsgLanguageContentDict['srcImgError_xipSizeTooLarge'][self.languageIndex] + u"0x%s !" %(rundef.kBootDeviceMemXipSize_FlexspiNor))
                     return False
             else:
                 #self.destAppVectorOffset = RTyyyy_gendef.kInitialLoadSize_NOR

src/gen/RTyyyy_gencore.py

@@ -423,6 +423,7 @@ def _extractImageDataFromSrcApp(self, wholeSrcAppBytes, fdcbOffset, appName ):
             imageDataOffset = destAppContainerOffset + img0Offset
             imageDataBytes = wholeSrcAppBytes[imageDataOffset:imageDataOffset+img0Size]
             self._genRawBinDestAppFile(imageDataBytes)
+            return img0LoadAddr, img0Entry, len(imageDataBytes)
 
     def _RTyyyy_isSrcAppBootableImage( self, initialLoadAppBytes ):
         try:
@@ -453,6 +454,7 @@ def _RTyyyy_isSrcAppBootableImage( self, initialLoadAppBytes ):
                 if (ivtBd <= ivtSelf) or (ivtBd - ivtSelf != RTyyyy_memdef.kMemBlockSize_IVT):
                     return False, None
             self.printLog('Original image file is a bootable image file')
+            #self.printDeviceStatus("fdcbOffset  = " + str(hex(fdcbOffset)))
             return True, fdcbOffset
         except:
             return False, None
@@ -974,8 +976,9 @@ def _createMatchedAppInfofile( self, ideRetryType ):
         self.isXipApp = False
         self.destAppVectorAddress = imageStartAddr
         if self.bootDevice == RTyyyy_uidef.kBootDevice_FlexspiNor:
-            if ((imageStartAddr >= self.tgt.flexspiNorMemBase) and (imageStartAddr < self.tgt.flexspiNorMemBase + RTyyyy_rundef.kBootDeviceMemXipSize_FlexspiNor)):
-                if (imageStartAddr + imageLength <= self.tgt.flexspiNorMemBase + RTyyyy_rundef.kBootDeviceMemXipSize_FlexspiNor):
+            self.adjustTgtFlexspiMemBaseAccordingToApp(imageStartAddr)
+            if ((imageStartAddr >= self.tgt.flexspiNorMemBase) and (imageStartAddr < self.tgt.flexspiNorMemBase + rundef.kBootDeviceMemXipSize_FlexspiNor)):
+                if (imageStartAddr + imageLength <= self.tgt.flexspiNorMemBase + rundef.kBootDeviceMemXipSize_FlexspiNor):
                     self.isXipApp = True
                     self.destAppVectorOffset = imageStartAddr - self.tgt.flexspiNorMemBase
                     minReservedSize = 0
@@ -990,7 +993,7 @@ def _createMatchedAppInfofile( self, ideRetryType ):
 
                         return False
                 else:
-                    self.popupMsgBox(uilang.kMsgLanguageContentDict['srcImgError_xipSizeTooLarge'][self.languageIndex] + str(hex(RTyyyy_rundef.kBootDeviceMemXipSize_FlexspiNor)) + " !")
+                    self.popupMsgBox(uilang.kMsgLanguageContentDict['srcImgError_xipSizeTooLarge'][self.languageIndex] + str(hex(rundef.kBootDeviceMemXipSize_FlexspiNor)) + " !")
                     return False
             else:
                 if self.tgt.bootHeaderType == gendef.kBootHeaderType_Container:

src/gen/gencore.py

@@ -242,3 +242,30 @@ def getImageVersionValueFromSrcApp(self, initialLoadAppBytes, fdcbOffset ):
             var32Vaule = rundef.kFlexspiNorContent_Blank32
         return var32Vaule
 
+    def adjustTgtFlexspiMemBaseAccordingToApp( self, imageStartAddr ):
+        flexspiNorMemBase  = None
+        flexspiNorMemBaseNs = None
+        flexspiNorMemBaseAliased = None
+        if self.flexspiXipRegionSel == 0:
+            flexspiNorMemBase  = self.tgt.flexspiNorMemBase0
+            flexspiNorMemBaseNs = self.tgt.flexspiNorMemBase0Ns
+            flexspiNorMemBase0Aliased = self.tgt.flexspiNorMemBase0Aliased
+        elif self.flexspiXipRegionSel == 1:
+            flexspiNorMemBase  = self.tgt.flexspiNorMemBase1
+            flexspiNorMemBaseNs = self.tgt.flexspiNorMemBase1Ns
+            flexspiNorMemBase1Aliased = self.tgt.flexspiNorMemBase1Aliased
+        else:
+            pass
+        if flexspiNorMemBase != None:
+            if ((imageStartAddr >= flexspiNorMemBase) and (imageStartAddr < flexspiNorMemBase + rundef.kBootDeviceMemXipSize_FlexspiNor)):
+                self.tgt.flexspiNorMemBase = flexspiNorMemBase
+                return
+        if flexspiNorMemBaseNs != None:
+            if ((imageStartAddr >= flexspiNorMemBaseNs) and (imageStartAddr < flexspiNorMemBaseNs + rundef.kBootDeviceMemXipSize_FlexspiNor)):
+                self.tgt.flexspiNorMemBase = flexspiNorMemBaseNs
+                return
+        if flexspiNorMemBaseAliased != None:
+            if ((imageStartAddr >= flexspiNorMemBaseAliased) and (imageStartAddr < flexspiNorMemBaseAliased + rundef.kBootDeviceMemXipSize_FlexspiNor)):
+                self.tgt.flexspiNorMemBase = flexspiNorMemBaseAliased
+                return
+

src/main.py

@@ -744,14 +744,15 @@ def callbackShowRevisionHistory( self, event ):
                    (uilang.kMsgLanguageContentDict['revisionHistory_v4_1_0'][self.languageIndex]) +
                    (uilang.kMsgLanguageContentDict['revisionHistory_v4_1_1'][self.languageIndex]) +
                    (uilang.kMsgLanguageContentDict['revisionHistory_v5_0_0'][self.languageIndex]) +
-                   (uilang.kMsgLanguageContentDict['revisionHistory_v5_1_0'][self.languageIndex]))
+                   (uilang.kMsgLanguageContentDict['revisionHistory_v5_1_0'][self.languageIndex]) +
+                   (uilang.kMsgLanguageContentDict['revisionHistory_v5_2_0'][self.languageIndex]))
         wx.MessageBox(msgText, uilang.kMsgLanguageContentDict['revisionHistory_title'][self.languageIndex], wx.OK | wx.ICON_INFORMATION)
 
 if __name__ == '__main__':
     app = wx.App()
 
     g_main_win = secBootMain(None)
-    g_main_win.SetTitle(u"NXP MCU Boot Utility v5.1.0")
+    g_main_win.SetTitle(u"NXP MCU Boot Utility v5.2.0")
     g_main_win.Show()
 
     g_task_detectUsbhid = threading.Thread(target=g_main_win.task_doDetectUsbhid)

src/run/RTyyyy_runcore.py

@@ -345,7 +345,10 @@ def _selectFlashloader( self ):
                 if self.tgt.bootHeaderType == gendef.kBootHeaderType_IVT:
                     flBinFile = os.path.join(self.cpuDir, 'ivt_flashloader.bin')
                 elif self.tgt.bootHeaderType == gendef.kBootHeaderType_Container:
-                    flBinFile = os.path.join(self.cpuDir, 'cntr_flashloader.bin')
+                    if (self.tgt.flexspiNorMemBase >> 28) % 2:
+                        flBinFile = os.path.join(self.cpuDir, 'cntr_flashloader_s.bin')
+                    else:
+                        flBinFile = os.path.join(self.cpuDir, 'cntr_flashloader_ns.bin')
                 else:
                     pass
                 flSrecFile = os.path.join(self.cpuDir, 'flashloader.srec')

src/run/rundef.py

@@ -35,3 +35,5 @@
 kXspiNorDefaultMemInfo_PageSize    = 0x100
 kXspiNorDefaultMemInfo_SectorSize  = 0x1000
 kXspiNorDefaultMemInfo_BlockSize   = 0x20000
+
+kBootDeviceMemXipSize_FlexspiNor   = 0x10000000 #256MB

src/targets/LPC55S16/bltargetconfig.py

@@ -56,8 +56,10 @@
 availableBootDevices = LPC_uidef.kBootDevice_Latest
 flexspiNorDevice = None
 flexspiNorMemBase0 = None
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = None
 xspiNorCfgInfoOffset = None

src/targets/LPC55S36/bltargetconfig.py

@@ -56,8 +56,10 @@
 availableBootDevices = LPC_uidef.kBootDevice_Latest
 flexspiNorDevice = None
 flexspiNorMemBase0 = None
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = None
 xspiNorCfgInfoOffset = None

src/targets/LPC55S69/bltargetconfig.py

@@ -56,8 +56,10 @@
 availableBootDevices = LPC_uidef.kBootDevice_Latest
 flexspiNorDevice = None
 flexspiNorMemBase0 = None
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = None
 xspiNorCfgInfoOffset = None

src/targets/MCXN947/bltargetconfig.py

@@ -56,8 +56,10 @@
 availableBootDevices = MCX_uidef.kBootDevice_Latest
 flexspiNorDevice = None
 flexspiNorMemBase0 = None
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = None
 xspiNorCfgInfoOffset = None

src/targets/MIMXRT1011/bltargetconfig.py

@@ -61,8 +61,10 @@
 availableBootDevices = [RTyyyy_uidef.kBootDevice_FlexspiNor]
 flexspiNorDevice = uidef.kFlexspiNorDevice_Adesto_AT25SF128A
 flexspiNorMemBase0 = 0x60000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = 0x08000000
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x400

src/targets/MIMXRT1015/bltargetconfig.py

@@ -63,8 +63,10 @@
                         RTyyyy_uidef.kBootDevice_LpspiNor]
 flexspiNorDevice = uidef.kFlexspiNorDevice_Adesto_AT25SF128A
 flexspiNorMemBase0 = 0x60000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = 0x08000000
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x0

src/targets/MIMXRT1021/bltargetconfig.py

@@ -61,8 +61,10 @@
 availableBootDevices = RTyyyy_uidef.kBootDevice_Latest
 flexspiNorDevice = uidef.kFlexspiNorDevice_ISSI_IS25LP064A
 flexspiNorMemBase0 = 0x60000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = 0x08000000
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x0

src/targets/MIMXRT1024/bltargetconfig.py

@@ -66,8 +66,10 @@
                         RTyyyy_uidef.kBootDevice_SemcNor]
 flexspiNorDevice = uidef.kFlexspiNorDevice_SipWinbond_W25Q32  # or 0xC0000007
 flexspiNorMemBase0 = 0x60000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = 0x08000000
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x0

src/targets/MIMXRT1042/bltargetconfig.py

@@ -61,8 +61,10 @@
 availableBootDevices = RTyyyy_uidef.kBootDevice_Latest
 flexspiNorDevice = uidef.kFlexspiNorDevice_ISSI_IS25LP064A
 flexspiNorMemBase0 = 0x60000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x0

src/targets/MIMXRT1052/bltargetconfig.py

@@ -61,8 +61,10 @@
 availableBootDevices = RTyyyy_uidef.kBootDevice_Latest
 flexspiNorDevice = uidef.kFlexspiNorDevice_ISSI_IS26KS512S
 flexspiNorMemBase0 = 0x60000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = 0x08000000
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x0

src/targets/MIMXRT1062/bltargetconfig.py

@@ -61,8 +61,10 @@
 availableBootDevices = RTyyyy_uidef.kBootDevice_Latest
 flexspiNorDevice = uidef.kFlexspiNorDevice_ISSI_IS25LP064A
 flexspiNorMemBase0 = 0x60000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x0

src/targets/MIMXRT1062X/bltargetconfig.py

@@ -61,8 +61,10 @@
 availableBootDevices = RTyyyy_uidef.kBootDevice_Latest
 flexspiNorDevice = uidef.kFlexspiNorDevice_ISSI_IS25LP064A
 flexspiNorMemBase0 = 0x60000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = 0x70000000
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x0

src/targets/MIMXRT1064/bltargetconfig.py

@@ -64,8 +64,10 @@
                         RTyyyy_uidef.kBootDevice_LpspiNor]
 flexspiNorDevice = uidef.kFlexspiNorDevice_SipWinbond_W25Q32  # or 0xC0000007
 flexspiNorMemBase0 = 0x70000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '75MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x0

src/targets/MIMXRT1166/bltargetconfig.py

@@ -68,8 +68,10 @@
                         RTyyyy_uidef.kBootDevice_LpspiNor]
 flexspiNorDevice = uidef.kFlexspiNorDevice_ISSI_IS25LP064A
 flexspiNorMemBase0 = 0x30000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = 0x60000000
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x400

src/targets/MIMXRT1176/bltargetconfig.py

@@ -68,8 +68,10 @@
                         RTyyyy_uidef.kBootDevice_LpspiNor]
 flexspiNorDevice = uidef.kFlexspiNorDevice_ISSI_IS25LP064A
 flexspiNorMemBase0 = 0x30000000
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = 0x60000000
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x400

src/targets/MIMXRT1189/bltargetconfig.py

@@ -60,11 +60,11 @@
                         RTyyyy_uidef.kBootDevice_UsdhcSd,
                         RTyyyy_uidef.kBootDevice_UsdhcMmc]
 flexspiNorDevice = uidef.kFlexspiNorDevice_ISSI_IS25LP064A
-flexspiNorMemBase0 = 0x38000000 # CM33 Secure
-                    #0x28000000 # CM33 Non-Secure
+flexspiNorMemBase0   = 0x38000000 # CM33 Secure
+flexspiNorMemBase0Ns = 0x28000000 # CM33 Non-Secure
 flexspiNorMemBase0Aliased = 0x12000000
-flexspiNorMemBase1 = 0x14000000 # CM33 Secure
-                    #0x04000000 # CM33 Non-Secure
+flexspiNorMemBase1   = 0x14000000 # CM33 Secure
+flexspiNorMemBase1Ns = 0x04000000 # CM33 Non-Secure
 flexspiNorMemBase1Aliased = 0x32000000
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x400

src/targets/MIMXRT595/bltargetconfig.py

@@ -58,10 +58,11 @@
                         RTxxx_uidef.kBootDevice_UsdhcMmc,
                         RTxxx_uidef.kBootDevice_FlexcommSpiNor]
 flexspiNorDevice = uidef.kFlexspiNorDevice_MXIC_MX25UM51345G
-flexspiNorMemBase0 = 0x08000000 # CM33 Non-Secure
-                    #0x18000000 # CM33 Secure
+flexspiNorMemBase0   = 0x18000000 # CM33 Secure
+flexspiNorMemBase0Ns = 0x08000000 # CM33 Non-Secure
 flexspiNorMemBase0Aliased = None
-flexspiNorMemBase1 = None
+flexspiNorMemBase1   = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x400

src/targets/MIMXRT685/bltargetconfig.py

@@ -56,10 +56,11 @@
 hasRemappedFuse = None
 availableBootDevices = RTxxx_uidef.kBootDevice_Latest
 flexspiNorDevice = uidef.kFlexspiNorDevice_MXIC_MX25UM51345G_2nd
-flexspiNorMemBase0 = 0x08000000 # CM33 Non-Secure
-                    #0x18000000 # CM33 Secure
+flexspiNorMemBase0   = 0x18000000 # CM33 Secure
+flexspiNorMemBase0Ns = 0x08000000 # CM33 Non-Secure
 flexspiNorMemBase0Aliased = None
-flexspiNorMemBase1 = None
+flexspiNorMemBase1   = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = ['30MHz', '50MHz', '60MHz', '80MHz', '100MHz', '120MHz', '133MHz', '166MHz', '200MHz']
 xspiNorCfgInfoOffset = 0x400

src/targets/MKxx/bltargetconfig.py

@@ -56,8 +56,10 @@
 availableBootDevices = Kinetis_uidef.kBootDevice_Latest
 flexspiNorDevice = None
 flexspiNorMemBase0 = None
+flexspiNorMemBase0Ns = None
 flexspiNorMemBase0Aliased = None
 flexspiNorMemBase1 = None
+flexspiNorMemBase1Ns = None
 flexspiNorMemBase1Aliased = None
 flexspiFreqs = None
 xspiNorCfgInfoOffset = None