From ac2c0f26100ec20a15184d18b8840c54f78f96b4 Mon Sep 17 00:00:00 2001
From: Zeqing Qin <zeqing@hust.edu.cn>
Date: Tue, 11 Apr 2023 16:33:11 +0800
Subject: [PATCH] =?UTF-8?q?bl808:=20=E7=BB=86=E5=8C=96flags=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8DflashCfgTable=EF=BC=8C=E5=AE=9A=E4=BD=8Dgroup?=
 =?UTF-8?q?=5Fimage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Zeqing Qin <zeqing@hust.edu.cn>
---
 BL808Image.bt | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/BL808Image.bt b/BL808Image.bt
index b727590..97f75c7 100644
--- a/BL808Image.bt
+++ b/BL808Image.bt
@@ -33,6 +33,16 @@ typedef struct {
     uint32 boot2_pt_table_1 <comment="address of partition table 1">;
     uint32 flashCfgTableAddr <format=hex,comment="address of flashcfg table list">;
     uint32 flashCfgTableLen <format=hex,comment="flashcfg table list len">;
+    
+    local quad off = FTell();
+    if(flashCfgTableAddr < FileSize() && flashCfgTableAddr + flashCfgTableLen <= FileSize()) {
+        FSeek(flashCfgTableAddr);
+        ubyte flashCfgTable[flashCfgTableLen]   <comment="flashCfgTable",bgcolor=cPurple>;
+    } else {
+        Warning("flashCfgTable appears to either overlap with header, exist after the end of the file or overlap with the end of the file!");
+    }
+    FSeek(off);
+    
     HAL_PATCH_CFG patch_on_read[4] <comment="do patch when read flash">;
     HAL_PATCH_CFG patch_on_jump[4] <comment="do patch when jump">;
     uint32 reserved[5];
@@ -155,11 +165,20 @@ typedef struct {
 } HAL_SYS_CLK_CONFIG;
 
 typedef struct {
-    uint32 flags <format=hex>;
+    uint32 sign_type          : 2 <comment="for sign">; 
    uint32 encrypt_type       : 2 <comment="for encrypt">; 
    uint32 key_sel            : 2 <comment="key slot">;
    uint32 xts_mode           : 1 <comment="for xts mode">; 
    uint32 aes_region_lock    : 1 <comment="rsvd">; 
    uint32 no_segment         : 1 <comment="no segment info">; 
    uint32 boot2_enable       : 1 <comment="boot2 enable">; 
    uint32 boot2_rollback     : 1 <comment="boot2 rollback">; 
    uint32 cpu_master_id      : 4 <comment="master id">; 
    uint32 notload_in_bootrom : 1 <comment="notload in bootrom">; 
    uint32 crc_ignore         : 1 <comment="ignore crc">; 
    uint32 hash_ignore        : 1 <comment="hash ignore">;
    uint32 power_on_mm        : 1 <comment="power on mm">; 
    uint32 em_sel             : 3 <comment="em_sel">; 
    uint32 cmds_en            : 1 <comment="command spliter enable">;
    uint32 cmds_wrap_mode     : 2 <comment="cmds wrap mode">; 
    uint32 cmds_wrap_len      : 4 <comment="cmds wrap len">; 
    uint32 icache_invalid     : 1 <comment="icache invalid">; 
    uint32 dcache_invalid     : 1 <comment="dcache invalid">; 
    uint32 fpga_halt_release  : 1 <comment="FPGA halt release function">;
     uint32 group_image_offset <format=hex,comment="flash controller offset">;
     uint32 aes_region_len <comment="aes region length">;
     uint32 img_len_cnt <comment="image length or segment count">;
     uint32 hash[8] <comment="hash of the image">;
+    
+    local quad off = FTell();
+    if(img_len_cnt < FileSize() && img_len_cnt + group_image_offset <= FileSize()) {
+        FSeek(group_image_offset);
+        ubyte image[img_len_cnt]   <comment="Segment data">;
+    } else {
+        Warning("Segment data appears to either overlap with header, exist after the end of the file or overlap with the end of the file!");
+    }
+    FSeek(off);
 } HAL_BASIC_CONFIG;
 
 typedef struct {
-- 
Gitee