Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pyot to support execution from flash and VMEM file format #150

Merged
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7625bc5
[ot] scripts/opentitan: flashgen.py: split into a module and a front-end
rivos-eblot Feb 18, 2025
1c829d3
[ot] python/qemu: ot.eflash.gen: add an option to bypass OT header va…
rivos-eblot Feb 18, 2025
8ff06ad
[ot] scripts/opentitan: pyot.py: fix a second level error
rivos-eblot Feb 18, 2025
14dcaf2
[ot] scripts/opentitan: pyot.py: remove _configure_logger
rivos-eblot Feb 18, 2025
889f7c3
[ot] scripts/opentitan: pyot.py: split into many modules and a front-end
rivos-eblot Feb 18, 2025
1fc43fb
[ot] scripts/opentitan: pyot.py: add no-flash-header option
rivos-eblot Feb 18, 2025
dc0ad69
[ot] python/qemu: ot.pyot: move guess_test_type into a utility module
rivos-eblot Mar 13, 2025
51c12ef
[ot] python/qemu: ot.util.file: add detection of VMEM file type
rivos-eblot Mar 13, 2025
ead7d2f
[ot] python/qemu: ot.pyot.filemgr: add support for ELF application files
rivos-eblot Mar 13, 2025
84abcf8
[ot] python/qemu: ot.pyot.filemgr: do not emit kernel option when emb…
rivos-eblot Feb 18, 2025
cb389db
[ot] python/qemu: ot.util.recfmt: import text record utility module
rivos-eblot Mar 3, 2025
f97417b
[ot] python/qemu: ot.util.recfmt: update Python syntax
rivos-eblot Mar 4, 2025
2f2cd77
[ot] python/qemu: ot.util.recfmt: add VMEM parser and builder
rivos-eblot Mar 4, 2025
f197d52
[ot] python/qemu: ot.util.file: add an ELF to VMEM conversion function
rivos-eblot Mar 5, 2025
47c9bc1
[ot] python/qemu: ot.pyot: fix invalid typing hints
rivos-eblot Mar 5, 2025
afba4b7
[ot] hw/opentitan: ot_csrng: fix format
rivos-eblot Mar 10, 2025
272881c
[ot] hw/opentitan: ot_flash: fix format
rivos-eblot Mar 10, 2025
1f37e96
[ot] .gitlab-ci.d: opentitan: add GitLab CI scripts
rivos-eblot Mar 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[ot] hw/opentitan: ot_flash: fix format
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
rivos-eblot committed Mar 13, 2025
commit 272881c0cd03782721c724661536f2a196094cec
11 changes: 6 additions & 5 deletions hw/opentitan/ot_flash.c
Original file line number Diff line number Diff line change
@@ -1402,10 +1402,10 @@ static void ot_flash_op_erase_bank(OtFlashState *s, unsigned address)
}

/*
* For bank erase only, if the data partition is selected, just the
* data partition is erased. If the info partition is selected, BOTH
* the data and info partitions are erased.
*/
* For bank erase only, if the data partition is selected, just the
* data partition is erased. If the info partition is selected, BOTH
* the data and info partitions are erased.
*/
unsigned bank_address = address - (address % bank_size);
bank_address /= sizeof(uint32_t); /* convert to word address */
unsigned data_address, info_address = 0u;
@@ -1819,7 +1819,8 @@ static void ot_flash_regs_write(void *opaque, hwaddr addr, uint64_t val64,
s->op.info_part = part_sel;
s->op.info_sel = info_sel;
s->op.erase_sel = (bool)erase_sel;
/* Erase operations neither go through FIFOs nor use/require a word count */
/* Erase operations neither go through FIFOs nor use/require a
* word count */
s->op.count = 0u;
xtrace_ot_flash_info("Erase at", s->op.address);
break;