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

Import latest changes from Earlgrey-9.1.0 branch #133

Merged

Conversation

rivos-eblot
Copy link

No description provided.

rivos-eblot and others added 4 commits February 4, 2025 13:44
Signed-off-by: Emmanuel Blot <[email protected]>
(cherry picked from commit 726a14e)
QEMU only supports a known list of OT machine, ensure the specified top
matches one of the supported machines.

It is also now possible to either:
- specify the path to the top configuration file, or
- specify the path to the OT directory and the top name

Also use a regular ordered dict (py3.7+) rather than a legacy OrderedDict
for managing HSJON content.

Signed-off-by: Emmanuel Blot <[email protected]>
(cherry picked from commit bc4626e)
(cherry picked from commit 10ef4c7)
Providing defaults here could be error prone. Instead, require that
these properties are set by the `cfggen.py` INI file.

There is already a trace in `ot_otp_dj_configure_scrmbl_key` and
`ot_otp_dj_configure_digest` when these properties are not set.

Signed-off-by: James Wainwright <[email protected]>
(cherry picked from commit b102b7c)
jwnrt and others added 4 commits February 4, 2025 14:23
Signed-off-by: James Wainwright <[email protected]>
(cherry picked from commit cd230b4)
Signed-off-by: James Wainwright <[email protected]>
(cherry picked from commit 9f05351)
…bus index.

Embedded flash option enables flash image generation for the internal flash
controller. It now requires a bus index to specify to which QEMU bus the
internal flash controller is connected, as this may depends on the machine
configuration.

Also assign an id to each drive option to avoid collisions due to QEMU
assigning the same default id if not explicitly specified.

Signed-off-by: Emmanuel Blot <[email protected]>
(cherry picked from commit 422dfb8)
Signed-off-by: Emmanuel Blot <[email protected]>
(cherry picked from commit 6e44ef3)
@rivos-eblot rivos-eblot merged commit fd532f1 into lowRISC:ot-darjeeling-9.2.0 Feb 4, 2025
6 checks passed
@rivos-eblot rivos-eblot deleted the dev/ebl/eg_backport branch February 5, 2025 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants