Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions conf/machine/iq-x7181-evk.conf
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-iq-x7181"
QCOM_CDT_FIRMWARE = "firmware-qcom-cdt-iq-x7181"

CAPSULE_GUID = "0F6D58FC-2258-4D27-9E23-D77219B0897C"
CAPSULE_FLASH_TYPE = "NORUFS"
CAPSULE_ENTRIES = "dtb"

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ricardo Salveti (@ricardosalveti) I can make these ?= if we want to make it easier to change in product overlay layers

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be fine, unless we expect this to be customized.


# Hamoa stores the Linux DTB FIT image in SPINOR. The firmware uses a
# main/backup model: dtb is always the active partition; dtb_BACKUP holds a
# rollback copy that is overwritten by <Backup> before dtb is updated.
CAPSULE_ENTRY_dtb[binary] = "dtb.bin"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just FYI, in the long term, I expect qcom-ptool to serve as the single source of truth for all partition-related configuration, including generation of a proper FvUpdate layout file for the capsule (YAML source file support has been landed already, but FvUpdate emitting is still in progress, more details in qualcomm-linux/qcom-ptool#124).

So when we switch to the new version of qcom-ptool, I don't think we'll need these CAPSULE_ENTRY definitions anymore.

CAPSULE_ENTRY_dtb[dest_disk] = "SPINOR"
CAPSULE_ENTRY_dtb[dest_partition] = "dtb"
CAPSULE_ENTRY_dtb[dest_guid] = "{2A1A52FC-AA0B-401C-A808-5EA0F91068F8}"
CAPSULE_ENTRY_dtb[backup_disk] = "SPINOR"
CAPSULE_ENTRY_dtb[backup_partition] = "dtb_BACKUP"
CAPSULE_ENTRY_dtb[backup_guid] = "{A166F11A-2B39-4FAA-B7E7-F8AA080D0587}"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One other issue found is that CAPSULE_ENTRY_dtb is not in do_compile's hash, so changes here would not trigger a rebuild.

We would also need something like in qcom-capsule.bbclass:

generate_fvupdate[vardeps] += "${@' '.join('CAPSULE_ENTRY_' + e for e in d.getVar('CAPSULE_ENTRIES').split())}"

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. This can probably be a separate PR or an additional patch on Igor Opaniuk (@igoropaniuk) 's #3043.

Would it stop this PR from moving forward? I think Igor Opaniuk (@igoropaniuk) can take a look?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a new commit with the suggested line, then we can merge, as it #3043 might take longer until it is ready to be merged.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. I'll get that in the morning.


# Isolate rt cpu
QCOM_RT_CPU = "11"
Expand Down

This file was deleted.

Loading