[REL] Ready for v5.2.1

Signed-off-by: Jay Heng <[email protected]>
JayHeng · Jul 14, 2023 · a5dd903 · a5dd903
1 parent 0a8ec94
commit a5dd903
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 7 deletions.
diff --git a/README-zh.md b/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.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)
+[![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.1.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/compare/v5.2.1...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) | 中文
 

diff --git a/README.md b/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.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)
+[![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.1.svg)](https://github.com/JayHeng/NXP-MCUBootUtility/compare/v5.2.1...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)
 

diff --git a/bin/NXP-MCUBootUtility.exe b/bin/NXP-MCUBootUtility.exe
diff --git a/gui/NXP-MCUBootUtility.fbp b/gui/NXP-MCUBootUtility.fbp
@@ -43308,7 +43308,7 @@
                                             <property name="caption"></property>
                                             <property name="caption_visible">1</property>
                                             <property name="center_pane">0</property>
-                                            <property name="choices">&quot;30MHz&quot; &quot;50MHz&quot; &quot;60MHz&quot; &quot;75MHz&quot; &quot;80MHz&quot; &quot;100MHz&quot;</property>
+                                            <property name="choices">&quot;30MHz&quot; &quot;50MHz&quot; &quot;60MHz&quot; &quot;72MHz&quot; &quot;80MHz&quot; &quot;100MHz&quot; &quot;133MHz&quot; &quot;166MHz&quot;</property>
                                             <property name="close_button">1</property>
                                             <property name="context_help"></property>
                                             <property name="context_menu">1</property>

diff --git a/src/main.py b/src/main.py
@@ -745,14 +745,15 @@ def callbackShowRevisionHistory( self, event ):
                    (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_2_0'][self.languageIndex]))
+                   (uilang.kMsgLanguageContentDict['revisionHistory_v5_2_0'][self.languageIndex]) +
+                   (uilang.kMsgLanguageContentDict['revisionHistory_v5_2_1'][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.2.0")
+    g_main_win.SetTitle(u"NXP MCU Boot Utility v5.2.1")
     g_main_win.Show()
 
     g_task_detectUsbhid = threading.Thread(target=g_main_win.task_doDetectUsbhid)

diff --git a/src/run/RTyyyy_runcore.py b/src/run/RTyyyy_runcore.py
@@ -963,12 +963,15 @@ def RTyyyy_configureBootDevice ( self ):
             self.RTyyyy_setFlexspiNorInstance()
         elif self.bootDevice == RTyyyy_uidef.kBootDevice_FlexspiNand:
             flexspiNandOpt0, flexspiNandOpt1, flexspiNandFcbOpt, flexspiNandImageInfoList = uivar.getBootDeviceConfiguration(self.bootDevice)
-            configOptList.extend([flexspiNandOpt0, flexspiNandOpt1, flexspiNandFcbOpt, self.tgt.ramFreeSpaceStart_LoadCommOpt])
+            configOptList.extend([flexspiNandFcbOpt, self.tgt.ramFreeSpaceStart_LoadCommOpt + (flexspiNandFcbOpt & 0x0000000F) * 4])
             for i in range(len(flexspiNandImageInfoList)):
                 if flexspiNandImageInfoList[i] != None:
                     configOptList.extend([flexspiNandImageInfoList[i]])
                 else:
                     break
+            configOptList.extend([flexspiNandOpt0])
+            if ((flexspiNandOpt0 & 0x0F000000) >> 24) == 1:
+                configOptList.extend([flexspiNandOpt1])
         elif self.bootDevice == RTyyyy_uidef.kBootDevice_LpspiNor:
             lpspiNorOpt0, lpspiNorOpt1 = uivar.getBootDeviceConfiguration(self.bootDevice)
             configOptList.extend([lpspiNorOpt0, lpspiNorOpt1])

diff --git a/src/ui/ui_cfg_flexspinand.py b/src/ui/ui_cfg_flexspinand.py
@@ -292,6 +292,9 @@ def _getImageInfo( self ):
         else:
             self.flexspiNandImageInfoList[7] = None
 
+        fcbOptBlockSize = imageCopies + 2
+        self.flexspiNandFcbOpt = (self.flexspiNandFcbOpt & 0xFFFFFFF0) | fcbOptBlockSize
+
     def callbackChangeImageCopies( self, event ):
         imageCopies = int(self.m_choice_imageCopies.GetString(self.m_choice_imageCopies.GetSelection()))
         self._updateImageInfoField(imageCopies)

diff --git a/src/ui/uilang.py b/src/ui/uilang.py
@@ -822,6 +822,12 @@
                      u"     3. [RT] 对于FlexSPI NOR设备，支持别名地址链接的程序 \n" + \
                      u"  改进: \n" + \
                      u"     1. [RT1180] 用户输入的源程序文件可以包含启动头 (Container) \n\n"
+kRevision_5_2_1_en =  "【v5.2.1】 - 2023.07\n" + \
+                      "  Bugfix: \n" + \
+                      "     1. [RTyyyy] Fix support for FlexSPI NAND device \n\n"
+kRevision_5_2_1_zh = u"【v5.2.1】 - 2023.07\n" + \
+                     u"  修复: \n" + \
+                     u"     1. [RTyyyy] 修复对FlexSPI NAND设备的下载支持 \n\n"
 
 kMsgLanguageContentDict = {
         'homePage_title':                     ['Home Page',                             u"项目主页"],
@@ -861,6 +867,7 @@
         'revisionHistory_v5_0_0':             [kRevision_5_0_0_en,                      kRevision_5_0_0_zh],
         'revisionHistory_v5_1_0':             [kRevision_5_1_0_en,                      kRevision_5_1_0_zh],
         'revisionHistory_v5_2_0':             [kRevision_5_2_0_en,                      kRevision_5_2_0_zh],
+        'revisionHistory_v5_2_1':             [kRevision_5_2_1_en,                      kRevision_5_2_1_zh],
 
         'bootDeviceInfo_hasOnchipSerialNor':  ['MCU has on-chip QSPI NOR Flash (4MB, 133MHz), so you don\'t need to configure this boot device!',
                                               u"微控制器内置4MB的QSPI NOR Flash，所以无需配置该启动设备！"],

diff --git a/src/win/bootDeviceWin_FlexspiNand.py b/src/win/bootDeviceWin_FlexspiNand.py
@@ -74,7 +74,7 @@ def __init__( self, parent ):
 
         gSizer_nandOpt.Add( self.m_staticText_maxFreq, 0, wx.ALL, 5 )
 
-        m_choice_maxFreqChoices = [ u"30MHz", u"50MHz", u"60MHz", u"75MHz", u"80MHz", u"100MHz" ]
+        m_choice_maxFreqChoices = [ u"30MHz", u"50MHz", u"60MHz", u"72MHz", u"80MHz", u"100MHz", u"133MHz", u"166MHz" ]
         self.m_choice_maxFreq = wx.Choice( self.m_panel_nandOpt, wx.ID_ANY, wx.DefaultPosition, wx.Size( 108,-1 ), m_choice_maxFreqChoices, 0 )
         self.m_choice_maxFreq.SetSelection( 0 )
         gSizer_nandOpt.Add( self.m_choice_maxFreq, 0, wx.ALL, 5 )