[REL] Rebuild for v6.0.0

Signed-off-by: Jay Heng <[email protected]>
JayHeng · Nov 3, 2023 · 2599b68 · 2599b68
1 parent 7eea198
commit 2599b68
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/bin/NXP-MCUBootUtility.exe b/bin/NXP-MCUBootUtility.exe
diff --git a/src/run/RTyyyy_runcore.py b/src/run/RTyyyy_runcore.py
@@ -452,7 +452,7 @@ def _RTyyyy_readMcuDeviceFuseBootCfg( self ):
             sipBit = self.RTyyyy_readMcuDeviceFuseByBlhost(self.tgt.efusemapIndexDict['kEfuseIndex_MISC_CONF0'], '', False)
             if sipBit != None:
                 self.flexspiBootInstanceFromFuse = (sipBit & 0x100000) >> 20
-                self.setFlexspiBootInstance()
+                self.getFlexspiBootInstance()
 
     def _genOtpmkDekFile( self, otpmk4, otpmk5, otpmk6, otpmk7 ):
         try:
@@ -935,7 +935,6 @@ def RTyyyy_setFlexspiInstance( self ):
             pass
 
     def RTyyyy_configureBootDevice ( self ):
-        self._RTyyyy_prepareForBootDeviceOperation()
         flexspiNorDeviceModel = None
         configOptList = []
         if self.bootDevice == RTyyyy_uidef.kBootDevice_SemcNand:
@@ -980,6 +979,7 @@ def RTyyyy_configureBootDevice ( self ):
             configOptList.extend([usdhcMmcOpt0, usdhcMmcOpt1])
         else:
             pass
+        self._RTyyyy_prepareForBootDeviceOperation()
         status = boot.status.kStatus_Success
         if flexspiNorDeviceModel == uidef.kFlexspiNorDevice_FDCB:
             if self.RTyyyy_isDeviceEnabledToOperate:

diff --git a/src/ui/uilang.py b/src/ui/uilang.py
@@ -896,14 +896,16 @@
                       "     2. [Wireless] Support RW61x \n" + \
                       "     3. [RW61x] Support FlexSPI NOR boot device \n" + \
                       "  Bugfix: \n" + \
-                      "     1. [RTxxx] Fix support for FlexSPI device \n\n"
+                      "     1. [RTyyyy] Fix support for 2nd FlexSPI NOR instance \n" + \
+                      "     2. [RTxxx] Fix support for FlexSPI NOR device \n\n"
 kRevision_6_0_0_zh = u"【v6.0.0】 - 2023.11\n" + \
                      u"  特性: \n" + \
                      u"     1. [Wireless] 支持K32W0x1 \n" + \
                      u"     2. [Wireless] 支持RW61x \n" + \
                      u"     3. [RW61x] 支持FlexSPI NOR启动设备 \n" + \
                      u"  修复: \n" + \
-                     u"     1. [RTxxx] 修复对FlexSPI设备的下载支持 \n\n"
+                     u"     1. [RTyyyy] 修复对第二个FlexSPI NOR设备的下载支持 \n" + \
+                     u"     2. [RTxxx] 修复对FlexSPI NOR设备的下载支持 \n\n"
 
 kMsgLanguageContentDict = {
         'homePage_title':                     ['Home Page',                             u"项目主页"],