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

swupdate fixes for master #305

Merged
merged 3 commits into from
Jul 31, 2024
Merged

Conversation

dwalkes
Copy link
Member

@dwalkes dwalkes commented Jul 31, 2024

  • Fix dependencies for dtbfile reference
  • Update the path to the capsule file to match JP6
  • Remove overrides no longer used on jp6 branches.

These commits should be ready for backport to scarthgap as well.

The first two commits can also go to scarthgap-l4t-r35.x (keep the overrides for t194 there)

FYI the master build is broken until https://groups.google.com/g/swupdate/c/U-GNI3mhbX0 or something similar is merged in meta-swupdate. I've tested locally with these changes on jetson-orin-nano-devkit-nvme in these scenarios:

  1. master branch to master branch (Jetpack 6)
  2. kirkstone branch to master branch (Jetpack 5->6).

dwalkes added 3 commits July 30, 2024 10:25
I haven't tracked down the change which meant the DTBFILE
was no longer in the DEPLOY_DIR_IMAGE on scarthgap, however
I suspect it was related to the recent refactor in tegra-uefi-capsules.

Based on [1] it would still be nice if we include dtbfiles as
backup in the dtb partitions, even when using extlinux.

Use the DTB_EXTRA_DEPS to bring in the necessary deps to include
the dtb in sysroot and EXTERNAL_KERNEL_DEVICETREE to locate when
not in the DEPLOY_DIR_IMAGE.

1: OE4T/meta-tegra@d4dfb31

Signed-off-by: Dan Walkes <danwalkes@trellis-logic.com>
The capsule file location changed between Jetpack 5 and 6.

The jetpack 6 location is verified backward compatible with
Jetpack 6, meaning performing a jetpack 6 capsule upgrade on
jetpack 5 works, at least as tested on orin-nano-nvme from
kirkstone.

See relevant thread at [1]

1: https://matrix.to/#/!mKaltPMAHUgQwPUKcH:gitter.im/$G3BKNMNd-B9gWzmGJilHgRRgcayK1ycye0v84V5ka_s?via=gitter.im&via=matrix.org&via=0m.ax

Signed-off-by: Dan Walkes <danwalkes@trellis-logic.com>
Since this platform is not supported.

Signed-off-by: Dan Walkes <danwalkes@trellis-logic.com>
Copy link
Member

@ichergui ichergui left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks @dwalkes

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