riscv: telink: load DAC key/cert from flash zone.#366
Merged
damien0x0023 merged 5 commits intodevelop_dualfrom Jan 13, 2025
Merged
riscv: telink: load DAC key/cert from flash zone.#366damien0x0023 merged 5 commits intodevelop_dualfrom
damien0x0023 merged 5 commits intodevelop_dualfrom
Conversation
pulin1103
requested review from
andy-liu-telink,
damien0x0023,
fengtai-telink and
haiwentelink
| { | ||
| return false; | ||
| } | ||
| if (efuse_get_chip_id(chip_id)) |
Collaborator
There was a problem hiding this comment.
efuse_get_chip_id在B92和TL321x中的返回值不同的，处理逻辑刚好相反。可以参考金邈的这个PR里面的处理方式：telink-semi/mcuboot#3
liucoldstar
reviewed
Jan 9, 2025
| } | ||
|
|
||
| size_t dac_cert_len; | ||
| dac_cert_len = buffer[100]; |
Collaborator
There was a problem hiding this comment.
100用宏表示一下吧。 比如
static constexpr uint32_t kDacContentsOffset = 100;
|
|
||
| size_t dac_cert_len; | ||
| dac_cert_len = buffer[100]; | ||
| dac_cert_len |= (uint16_t) buffer[101] << 8; |
Collaborator
There was a problem hiding this comment.
按照上面的处理方式，这里可以101可以替换成kDacContentsOffset + 1
| { | ||
| return false; | ||
| } | ||
| factoryData->dac_cert.data = buffer + 102; |
Collaborator
There was a problem hiding this comment.
kDacContentsOffset + 2
pulin1103
force-pushed
the
develop_dual_dac_loader
branch
from
acda9b6 to
9f99531
Compare
|
|
||
| #if CHIP_DEVICE_SECURE_PROGRAMMING | ||
|
|
||
| #if defined(CONFIG_SOC_RISCV_TELINK_B92) |
Collaborator
There was a problem hiding this comment.
是不是可以改成 #ifdef CONFIG_SOC_RISCV_TELINK_B92
| #include "aes.h" | ||
| #endif | ||
|
|
||
| #if defined(CONFIG_SOC_RISCV_TELINK_TL321X) |
Collaborator
There was a problem hiding this comment.
#if defined -> #ifdef
| config SECURE_PROGRAMMING | ||
| bool "Enable reading DAC and keys from the DAC partition" | ||
| depends on CHIP_FACTORY_DATA | ||
| default n |
Collaborator
There was a problem hiding this comment.
还有就是，我记得海文说过，Kconfig里面不要Enable xxx，CI会不过，直接Read DAC and keys from the DAC partition会不会简单点
Collaborator
There was a problem hiding this comment.
刚和海文确认了下，matter这边没这个问题，那应该没什么问题
pulin1103
force-pushed
the
develop_dual_dac_loader
branch
from
9f99531 to
f20f19e
Compare
Signed-off-by: Zhenghuan Zhang <zhenghuan.zhang@telink-semi.com>
pulin1103
force-pushed
the
develop_dual_dac_loader
branch
from
f20f19e to
f23f72a
Compare
- add plaintext vid, pid & discriminator at the beginning. - add optional argument --secure-programming-verification and --chip-id to generate factory data and independent DAC. Signed-off-by: Damien Ji <yinghao.ji@telink-semi.com> Signed-off-by: Zhenghuan Zhang <zhenghuan.zhang@telink-semi.com>
pulin1103
force-pushed
the
develop_dual_dac_loader
branch
from
099e852 to
0abcf93
Compare
Signed-off-by: Zhenghuan Zhang <zhenghuan.zhang@telink-semi.com>
- modify mfg_tool code format. - add merge_factorydata_dac. Signed-off-by: Damien Ji <yinghao.ji@telink-semi.com>
to fix code style issues. Signed-off-by: Damien Ji <yinghao.ji@telink-semi.com>
damien0x0023
force-pushed
the
develop_dual_dac_loader
branch
from
1724e4c to
9bac534
Compare
damien0x0023
requested review from
andy-liu-telink,
fengtai-telink and
liucoldstar
| } | ||
| else | ||
| { | ||
| LOG_ERR("Private key decryption failed."); |
Collaborator
There was a problem hiding this comment.
这个错误信息应该改成“Failed to retrieve chip ID.”
Collaborator
There was a problem hiding this comment.
@pulin1103 How about we add this change to my next Pull Request?
damien0x0023
approved these changes
Jan 13, 2025
fengtai-telink
pushed a commit
that referenced
this pull request
Mar 6, 2025
- modify factorydataparse to load DAC key/cert from the flash zone. - add plaintext vid, pid & discriminator at the beginning of factory_data_ext. - add optional argument --secure-programming-verification and --chip-id to generate factory_data_ext without DAC and independent DAC. - add merge_factorydata_dac for TL321x programming. Signed-off-by: Zhenghuan Zhang <zhenghuan.zhang@telink-semi.com> Signed-off-by: Damien Ji <yinghao.ji@telink-semi.com> Co-authored-by: Zhenghuan Zhang <zhenghuan.zhang@telink-semi.com> Co-authored-by: Damien Ji <yinghao.ji@telink-semi.com>
fengtai-telink
pushed a commit
that referenced
this pull request
Apr 3, 2025
- modify factorydataparse to load DAC key/cert from the flash zone. - add plaintext vid, pid & discriminator at the beginning of factory_data_ext. - add optional argument --secure-programming-verification and --chip-id to generate factory_data_ext without DAC and independent DAC. - add merge_factorydata_dac for TL321x programming. Signed-off-by: Zhenghuan Zhang <zhenghuan.zhang@telink-semi.com> Signed-off-by: Damien Ji <yinghao.ji@telink-semi.com> Co-authored-by: Zhenghuan Zhang <zhenghuan.zhang@telink-semi.com> Co-authored-by: Damien Ji <yinghao.ji@telink-semi.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.