From: luozheng <1732036298@qq.com> Date: Sat, 19 Jul 2025 03:29:28 +0000 (+0800) Subject: tools文件夹合并 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~246 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.js?a=commitdiff_plain;h=3545703837331fb5a4d06fd82645f3a62a2a36bd;p=mirrors%2FFD230.git tools文件夹合并 --- diff --git a/code/sdk/tools/pkg/bin/brandy/bt.bin b/code/sdk/tools/pkg/bin/brandy/bt.bin index 8bdf8cec2..fd1786183 100644 Binary files a/code/sdk/tools/pkg/bin/brandy/bt.bin and b/code/sdk/tools/pkg/bin/brandy/bt.bin differ diff --git a/code/sdk/tools/pkg/bin/brandy/dsp/max/dsp_main.bin b/code/sdk/tools/pkg/bin/brandy/dsp/max/dsp_main.bin index 47dbba122..aabd70507 100644 Binary files a/code/sdk/tools/pkg/bin/brandy/dsp/max/dsp_main.bin and b/code/sdk/tools/pkg/bin/brandy/dsp/max/dsp_main.bin differ diff --git a/code/sdk/tools/pkg/bin/brandy/dsp/max/dsp_overlay.bin b/code/sdk/tools/pkg/bin/brandy/dsp/max/dsp_overlay.bin index a4b84186f..ec80a155c 100644 Binary files a/code/sdk/tools/pkg/bin/brandy/dsp/max/dsp_overlay.bin and b/code/sdk/tools/pkg/bin/brandy/dsp/max/dsp_overlay.bin differ diff --git a/code/sdk/tools/pkg/bin/brandy/dsp/mini/dsp_main.bin b/code/sdk/tools/pkg/bin/brandy/dsp/mini/dsp_main.bin index ddeea8447..5cd660286 100644 Binary files a/code/sdk/tools/pkg/bin/brandy/dsp/mini/dsp_main.bin and b/code/sdk/tools/pkg/bin/brandy/dsp/mini/dsp_main.bin differ diff --git a/code/sdk/tools/pkg/bin/brandy/dsp/mini/dsp_overlay.bin b/code/sdk/tools/pkg/bin/brandy/dsp/mini/dsp_overlay.bin index de08c7886..68f542f98 100644 Binary files a/code/sdk/tools/pkg/bin/brandy/dsp/mini/dsp_overlay.bin and b/code/sdk/tools/pkg/bin/brandy/dsp/mini/dsp_overlay.bin differ diff --git a/code/sdk/tools/pkg/bin/brandy/dsp/ultra/dsp_main.bin b/code/sdk/tools/pkg/bin/brandy/dsp/ultra/dsp_main.bin index 54ec7597e..0d1657a81 100644 Binary files a/code/sdk/tools/pkg/bin/brandy/dsp/ultra/dsp_main.bin and b/code/sdk/tools/pkg/bin/brandy/dsp/ultra/dsp_main.bin differ diff --git a/code/sdk/tools/pkg/bin/brandy/dsp/ultra/dsp_overlay.bin b/code/sdk/tools/pkg/bin/brandy/dsp/ultra/dsp_overlay.bin index 7878450c5..1a2e755d5 100644 Binary files a/code/sdk/tools/pkg/bin/brandy/dsp/ultra/dsp_overlay.bin and b/code/sdk/tools/pkg/bin/brandy/dsp/ultra/dsp_overlay.bin differ diff --git a/code/sdk/tools/pkg/chip_packet/brandy/packet.py b/code/sdk/tools/pkg/chip_packet/brandy/packet.py index 80a4fa701..1bc4d08a5 100644 --- a/code/sdk/tools/pkg/chip_packet/brandy/packet.py +++ b/code/sdk/tools/pkg/chip_packet/brandy/packet.py @@ -56,6 +56,7 @@ def build_brandy_other_bin(pack_style_str, flash_size, no_dsp): def make_all_in_one_packet_8M(pack_style_str): # make all in one packet + target_env = TargetEnvironment(pack_style_str) bin_dir = os.path.join(PKG_DIR, "bin", "brandy") application_dir = os.path.join(SDK_DIR, "output", @@ -91,7 +92,6 @@ def make_all_in_one_packet_8M(pack_style_str): bt = os.path.join(bin_dir, "bt.bin") bt_bx = bt + "|0x70090000|0x70000|20" - target_env = TargetEnvironment(pack_style_str) dsp_version = target_env.get("dsp_version") dsp_main = os.path.join(bin_dir, "dsp", dsp_version, "dsp_main.bin") dsp_main_bx = dsp_main + "|0x70100000|0x70000|22" @@ -119,6 +119,7 @@ def make_all_in_one_packet_8M(pack_style_str): def make_all_in_one_packet_no_dsp(pack_style_str): # make all in one packet + target_env = TargetEnvironment(pack_style_str) bin_dir = os.path.join(PKG_DIR, "bin", "brandy") application_dir = os.path.join(SDK_DIR, "output", @@ -137,7 +138,7 @@ def make_all_in_one_packet_no_dsp(pack_style_str): upload_app_fwpkg = os.path.join(PKG_DIR, "fwpkg", "brandy", "upload_app.fwpkg") - ssb = os.path.join(SDK_DIR, "output", "brandy", "acore", "brandy-ssb", "ssb.bin") + ssb = os.path.join(SDK_DIR, "output", "brandy", "acore", target_env.get("ssb_version"), "ssb.bin") if not os.path.exists(ssb): ssb = os.path.join(bin_dir, "ssb.bin") print("ssb_path: ", ssb) @@ -173,6 +174,7 @@ def make_all_in_one_packet_no_dsp(pack_style_str): def make_all_in_one_packet_16M(pack_style_str): # make all in one packet + target_env = TargetEnvironment(pack_style_str) bin_dir = os.path.join(PKG_DIR, "bin", "brandy") application_dir = os.path.join(SDK_DIR, "output", @@ -209,7 +211,6 @@ def make_all_in_one_packet_16M(pack_style_str): bt = os.path.join(bin_dir, "bt.bin") bt_bx = bt + "|0x70090000|0x70000|20" - target_env = TargetEnvironment(pack_style_str) dsp_version = target_env.get("dsp_version") dsp_main = os.path.join(bin_dir, "dsp", dsp_version, "dsp_main.bin") dsp_main_bx = dsp_main + "|0x70100000|0xC0000|22"