冲突
This commit is contained in:
parent
e46beee76d
commit
0e86aede0d
@ -1 +1 @@
|
|||||||
/home/harmony/armino/LFV2/bk_aidk/bk_avdk/bk_idk/tools/env_tools/beken_packager/partition_bk7256_ota_a_new.json
|
/home/harmony/armino/git_bk258/bk_zuixin/bk7258_iR58/bk_aidk/bk_avdk/bk_idk/tools/env_tools/beken_packager/partition_bk7256_ota_a_new.json
|
||||||
|
@ -12,28 +12,28 @@
|
|||||||
"name": "app",
|
"name": "app",
|
||||||
"flash_name": "beken_onchip_crc",
|
"flash_name": "beken_onchip_crc",
|
||||||
"offset": "0x00011000",
|
"offset": "0x00011000",
|
||||||
"len": "2584K"
|
"len": "2856K"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"magic": "0x45503130",
|
"magic": "0x45503130",
|
||||||
"name": "app1",
|
"name": "app1",
|
||||||
"flash_name": "beken_onchip_crc",
|
"flash_name": "beken_onchip_crc",
|
||||||
"offset": "0x00297000",
|
"offset": "0x002db000",
|
||||||
"len": "408K"
|
"len": "1496K"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"magic": "0x45503130",
|
"magic": "0x45503130",
|
||||||
"name": "app2",
|
"name": "app2",
|
||||||
"flash_name": "beken_onchip_crc",
|
"flash_name": "beken_onchip_crc",
|
||||||
"offset": "0x002fd000",
|
"offset": "0x00451000",
|
||||||
"len": "136K"
|
"len": "476K"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"magic": "0x45503130",
|
"magic": "0x45503130",
|
||||||
"name": "download",
|
"name": "download",
|
||||||
"flash_name": "beken_onchip",
|
"flash_name": "beken_onchip",
|
||||||
"offset": "0x0031f000",
|
"offset": "0x004c8000",
|
||||||
"len": "1792K"
|
"len": "3196K"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user