[REL] Rebuild for v5.3.0

Signed-off-by: Jay Heng <hengjie1989@foxmail.com>
JayHeng · Sep 15, 2023 · f10beea · f10beea
1 parent 4ca6954
commit f10beea
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/bin/NXP-MCUBootUtility.exe b/bin/NXP-MCUBootUtility.exe
diff --git a/gen/xmcd_file/_temp.txt b/gen/xmcd_file/_temp.txt
diff --git a/src/targets/xmcd_model/xmcd_flexspi1_hyperram_1v8_133mhz.bin b/src/targets/xmcd_model/xmcd_flexspi1_hyperram_1v8_133mhz.bin
diff --git a/src/ui/ui_cfg_xmcd.py b/src/ui/ui_cfg_xmcd.py
@@ -66,7 +66,10 @@ def _recoverLastSettings ( self ):
             memInterface = (self.xmcdHeader & 0x00F00000) >> 20
             self.m_choice_memoryInterface.SetSelection(memInterface)
             self._getMemoryInterface()
-            self.m_choice_interfaceInstance.SetSelection((self.xmcdHeader & 0x000F0000) >> 16)
+            interfaceInstance = (self.xmcdHeader & 0x000F0000) >> 16
+            if interfaceInstance == 0:
+                interfaceInstance = 1
+            self.m_choice_interfaceInstance.SetSelection(interfaceInstance - 1)
             self.m_choice_cfgBlockType.SetSelection((self.xmcdHeader & 0x0000F000) >> 12)
             if memInterface == 0:   # FlexSPI
                 self.m_choice_deviceType.SetSelection((self.xmcdOption0 & 0x00F00000) >> 20)
@@ -152,7 +155,7 @@ def _getMemoryInterface( self ):
             pass
 
     def _getInterfaceInstance( self ):
-        val = self.m_choice_interfaceInstance.GetSelection()
+        val = self.m_choice_interfaceInstance.GetSelection() + 1
         self.xmcdHeader = (self.xmcdHeader & 0xFFF0FFFF) | (val << 16)
 
     def _getCfgBlockType( self ):

diff --git a/src/ui/uilang.py b/src/ui/uilang.py
@@ -855,14 +855,14 @@
                       "     3. [RT] Add FlexSPI NAND device model support \n" + \
                       "  Improvement: \n" + \
                       "     1. [RTyyyy] Change FlexSPI instance selection from menu to config win \n" + \
-                      "     2. [RTyyyy] Can recognise Non-XIP image which is linked in FlexSPI RAM region \n" + \
+                      "     2. [RTyyyy] Can recognize Non-XIP image which is linked in FlexSPI RAM region \n" + \
                       "  Bugfix: \n" + \
-                      "     1. [RTyyyy] Cannot recognise bootable image which offset of reset handler to vector is less than 0xB00 \n\n"
-kRevision_5_3_0_zh = u"【v5.3.0】 - 2023.08\n" + \
+                      "     1. [RTyyyy] Cannot recognize bootable image which offset of reset handler to vector is less than 0xB00 \n\n"
+kRevision_5_3_0_zh = u"【v5.3.0】 - 2023.09\n" + \
                      u"  特性: \n" + \
                      u"     1. [RTyyyy] 支持XMCD配置功能，可用于加载image进FlexSPI RAM/SEMC SDRAM执行 \n" + \
                      u"     2. [RTyyyy] 支持第二个FlexSPI去下载启动NAND \n" + \
-                     u"     3. [RTyyyy] 新增FlexSPI NAND启动设备模型支持 \n" + \
+                     u"     3. [RT] 新增FlexSPI NAND启动设备模型支持 \n" + \
                      u"  改进: \n" + \
                      u"     1. [RTyyyy] 将FlexSPI序号选择从菜单栏改至设备配置界面 \n" + \
                      u"     2. [RTyyyy] 可以识别链接在FlexSPI RAM区域的程序 \n" + \
@@ -914,7 +914,7 @@
                                               u"微控制器内置4MB的QSPI NOR Flash，所以无需配置该启动设备！"],
         'connectError_cannotSetOneStep':      ['One Step mode cannot be set under Entry Mode, Please switch to Master Mode and try again!',
                                               u"在软件入门级模式下，[一键连接]模式不可改，请切换到软件专家级模式下再试！"],
-        'connectError_InvalidUserFl':         ['Cannot recognise user flashloader file, please check linker address of flashloader!',
+        'connectError_InvalidUserFl':         ['Cannot recognize user flashloader file, please check linker address of flashloader!',
                                               u"无法识别flashloader_user.srec文件，请检查该flashloader地址链接是否合法！"],
         'connectError_failToJumpToFl':        ['MCU has entered ROM SDP mode but failed to jump to Flashloader, Please reset board and try again!',
                                               u"微控制器已成功进入ROM SDP模式，但是未能跳转进入Flashloader，请复位板子再试！"],
@@ -976,7 +976,7 @@
                                               u"密钥因子没有设置正确！"],
         'genImgError_vectorNotFound':         ['Cannot find the vector table address in this bootable image file: ',
                                               u"无法根据该可启动文件IVT头找到有效中断向量表地址: "],
-        'genImgError_formatNotValid':         ['Cannot recognise/convert the format of image file: ',
+        'genImgError_formatNotValid':         ['Cannot recognize/convert the format of image file: ',
                                               u"无法识别/转换该程序文件格式: "],
         'genImgError_bypassXmcd':             ['XMCD is bypassed due to DCD! For this case, you can download bootable binary under Programmer mode.',
                                               u"因为DCD的存在导致XMCD被忽略了! 这种情况建议使用通用编程器模式去下载"],

diff --git a/src/ui/uivar.py b/src/ui/uivar.py
@@ -328,7 +328,7 @@ def initVar(cfgFilename):
         g_xmcdSettingsDict['isXmcdEnabled'] = False
         g_xmcdSettingsDict['xmcdSource'] = 'Disable XMCD'
         g_xmcdSettingsDict['userBinFile'] = 'N/A'
-        g_xmcdSettingsDict['xmcdHeader'] = 0xC0000008
+        g_xmcdSettingsDict['xmcdHeader'] = 0xC0010008
         g_xmcdSettingsDict['xmcdOption0'] = 0xC0000700
         g_xmcdSettingsDict['xmcdOption1'] = 0x0
         g_xmcdSettingsDict['xmcdOption2'] = 0x0